Merge pull request #196 from Rangi42/polishedmaps

Rename map files, labels, and constants to be consistent and work with Polished Map

1398 files changed, 6631 insertions, 6166 deletions

diff --git a/audio.asm b/audio.asm
index be1e4bb9..70cf06fc 100644
--- a/audio.asm
+++ b/audio.asm
@@ -1,4 +1,3 @@
-
 INCLUDE "constants.asm"
 
 
@@ -12,7 +11,6 @@ SECTION "Sound Effect Headers 3", ROMX ; BANK $1f
 INCLUDE "audio/headers/sfxheaders3.asm"
 
 
-
 SECTION "Music Headers 1", ROMX ; BANK $02
 INCLUDE "audio/headers/musicheaders1.asm"
 
@@ -23,7 +21,6 @@ SECTION "Music Headers 3", ROMX ; BANK $1f
 INCLUDE "audio/headers/musicheaders3.asm"
 
 
-
 SECTION "Sound Effects 1", ROMX ; BANK $02
 
 INCLUDE "audio/sfx/snare1_1.asm"
diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm
index 1a44b1e7..d2077629 100755
--- a/constants/hide_show_constants.asm
+++ b/constants/hide_show_constants.asm
@@ -6,231 +6,231 @@
 
 const_value = 0
 
-	const HS_PALLET_TOWN_OAK              ; 00
-	const HS_LYING_OLD_MAN                ; 01
-	const HS_OLD_MAN                      ; 02
-	const HS_MUSEUM_GUY                   ; 03
-	const HS_GYM_GUY                      ; 04
-	const HS_CERULEAN_RIVAL               ; 05
-	const HS_CERULEAN_ROCKET              ; 06
-	const HS_CERULEAN_GUARD_1             ; 07
-	const HS_UNKNOWN_DUNGEON_GUY          ; 08
-	const HS_CERULEAN_GUARD_2             ; 09
-	const HS_SAFFRON_CITY_1               ; 0A
-	const HS_SAFFRON_CITY_2               ; 0B
-	const HS_SAFFRON_CITY_3               ; 0C
-	const HS_SAFFRON_CITY_4               ; 0D
-	const HS_SAFFRON_CITY_5               ; 0E
-	const HS_SAFFRON_CITY_6               ; 0F
-	const HS_SAFFRON_CITY_7               ; 10
-	const HS_SAFFRON_CITY_8               ; 11
-	const HS_SAFFRON_CITY_9               ; 12
-	const HS_SAFFRON_CITY_A               ; 13
-	const HS_SAFFRON_CITY_B               ; 14
-	const HS_SAFFRON_CITY_C               ; 15
-	const HS_SAFFRON_CITY_D               ; 16
-	const HS_SAFFRON_CITY_E               ; 17
-	const HS_SAFFRON_CITY_F               ; 18
-	const HS_ROUTE_2_ITEM_1               ; 19 X
-	const HS_ROUTE_2_ITEM_2               ; 1A X
-	const HS_ROUTE_4_ITEM                 ; 1B X
-	const HS_ROUTE_9_ITEM                 ; 1C X
-	const HS_ROUTE_12_SNORLAX             ; 1D
-	const HS_ROUTE_12_ITEM_1              ; 1E X
-	const HS_ROUTE_12_ITEM_2              ; 1F X
-	const HS_ROUTE_15_ITEM                ; 20 X
-	const HS_ROUTE_16_SNORLAX             ; 21
-	const HS_ROUTE_22_RIVAL_1             ; 22
-	const HS_ROUTE_22_RIVAL_2             ; 23
-	const HS_NUGGET_BRIDGE_GUY            ; 24
-	const HS_ROUTE_24_ITEM                ; 25 X
-	const HS_ROUTE_25_ITEM                ; 26 X
-	const HS_DAISY_SITTING                ; 27
-	const HS_DAISY_WALKING                ; 28
-	const HS_TOWN_MAP                     ; 29
-	const HS_OAKS_LAB_RIVAL               ; 2A
-	const HS_STARTER_BALL_1               ; 2B
-	const HS_STARTER_BALL_2               ; 2C
-	const HS_STARTER_BALL_3               ; 2D
-	const HS_OAKS_LAB_OAK_1               ; 2E
-	const HS_POKEDEX_1                    ; 2F
-	const HS_POKEDEX_2                    ; 30
-	const HS_OAKS_LAB_OAK_2               ; 31
-	const HS_VIRIDIAN_GYM_GIOVANNI        ; 32
-	const HS_VIRIDIAN_GYM_ITEM            ; 33 X
-	const HS_OLD_AMBER                    ; 34
-	const HS_UNKNOWN_DUNGEON_1_ITEM_1     ; 35 X
-	const HS_UNKNOWN_DUNGEON_1_ITEM_2     ; 36 X
-	const HS_UNKNOWN_DUNGEON_1_ITEM_3     ; 37 X
-	const HS_POKEMONTOWER_2_RIVAL         ; 38
-	const HS_POKEMONTOWER_3_ITEM          ; 39 X
-	const HS_POKEMONTOWER_4_ITEM_1        ; 3A X
-	const HS_POKEMONTOWER_4_ITEM_2        ; 3B X
-	const HS_POKEMONTOWER_4_ITEM_3        ; 3C X
-	const HS_POKEMONTOWER_5_ITEM          ; 3D X
-	const HS_POKEMONTOWER_6_ITEM_1        ; 3E X
-	const HS_POKEMONTOWER_6_ITEM_2        ; 3F X
-	const HS_POKEMONTOWER_7_ROCKET_1      ; 40 X
-	const HS_POKEMONTOWER_7_ROCKET_2      ; 41 X
-	const HS_POKEMONTOWER_7_ROCKET_3      ; 42 X
-	const HS_POKEMONTOWER_7_MR_FUJI       ; 43
-	const HS_LAVENDER_HOUSE_1_MR_FUJI     ; 44
-	const HS_CELADON_MANSION_5_GIFT       ; 45
-	const HS_GAME_CORNER_ROCKET           ; 46
-	const HS_FUCHSIA_HOUSE_2_ITEM         ; 47 X
-	const HS_MANSION_1_ITEM_1             ; 48 X
-	const HS_MANSION_1_ITEM_2             ; 49 X
-	const HS_FIGHTING_DOJO_GIFT_1         ; 4A
-	const HS_FIGHTING_DOJO_GIFT_2         ; 4B
-	const HS_SILPH_CO_1F_RECEPTIONIST     ; 4C
-	const HS_VOLTORB_1                    ; 4D X
-	const HS_VOLTORB_2                    ; 4E X
-	const HS_VOLTORB_3                    ; 4F X
-	const HS_ELECTRODE_1                  ; 50 X
-	const HS_VOLTORB_4                    ; 51 X
-	const HS_VOLTORB_5                    ; 52 X
-	const HS_ELECTRODE_2                  ; 53 X
-	const HS_VOLTORB_6                    ; 54 X
-	const HS_ZAPDOS                       ; 55 X
-	const HS_POWER_PLANT_ITEM_1           ; 56 X
-	const HS_POWER_PLANT_ITEM_2           ; 57 X
-	const HS_POWER_PLANT_ITEM_3           ; 58 X
-	const HS_POWER_PLANT_ITEM_4           ; 59 X
-	const HS_POWER_PLANT_ITEM_5           ; 5A X
-	const HS_MOLTRES                      ; 5B X
-	const HS_VICTORY_ROAD_2_ITEM_1        ; 5C X
-	const HS_VICTORY_ROAD_2_ITEM_2        ; 5D X
-	const HS_VICTORY_ROAD_2_ITEM_3        ; 5E X
-	const HS_VICTORY_ROAD_2_ITEM_4        ; 5F X
-	const HS_VICTORY_ROAD_2_BOULDER       ; 60
-	const HS_BILL_POKEMON                 ; 61
-	const HS_BILL_1                       ; 62
-	const HS_BILL_2                       ; 63
-	const HS_VIRIDIAN_FOREST_ITEM_1       ; 64 X
-	const HS_VIRIDIAN_FOREST_ITEM_2       ; 65 X
-	const HS_VIRIDIAN_FOREST_ITEM_3       ; 66 X
-	const HS_MT_MOON_1_ITEM_1             ; 67 X
-	const HS_MT_MOON_1_ITEM_2             ; 68 X
-	const HS_MT_MOON_1_ITEM_3             ; 69 X
-	const HS_MT_MOON_1_ITEM_4             ; 6A X
-	const HS_MT_MOON_1_ITEM_5             ; 6B X
-	const HS_MT_MOON_1_ITEM_6             ; 6C X
-	const HS_MT_MOON_3_FOSSIL_1           ; 6D
-	const HS_MT_MOON_3_FOSSIL_2           ; 6E
-	const HS_MT_MOON_3_ITEM_1             ; 6F X
-	const HS_MT_MOON_3_ITEM_2             ; 70 X
-	const HS_SS_ANNE_2_RIVAL              ; 71
-	const HS_SS_ANNE_8_ITEM               ; 72 X
-	const HS_SS_ANNE_9_ITEM_1             ; 73 X
-	const HS_SS_ANNE_9_ITEM_2             ; 74 X
-	const HS_SS_ANNE_10_ITEM_1            ; 75 X
-	const HS_SS_ANNE_10_ITEM_2            ; 76 X
-	const HS_SS_ANNE_10_ITEM_3            ; 77 X
-	const HS_VICTORY_ROAD_3_ITEM_1        ; 78 X
-	const HS_VICTORY_ROAD_3_ITEM_2        ; 79 X
-	const HS_VICTORY_ROAD_3_BOULDER       ; 7A
-	const HS_ROCKET_HIDEOUT_1_ITEM_1      ; 7B X
-	const HS_ROCKET_HIDEOUT_1_ITEM_2      ; 7C X
-	const HS_ROCKET_HIDEOUT_2_ITEM_1      ; 7D X
-	const HS_ROCKET_HIDEOUT_2_ITEM_2      ; 7E X
-	const HS_ROCKET_HIDEOUT_2_ITEM_3      ; 7F X
-	const HS_ROCKET_HIDEOUT_2_ITEM_4      ; 80 X
-	const HS_ROCKET_HIDEOUT_3_ITEM_1      ; 81 X
-	const HS_ROCKET_HIDEOUT_3_ITEM_2      ; 82 X
-	const HS_ROCKET_HIDEOUT_4_GIOVANNI    ; 83
-	const HS_ROCKET_HIDEOUT_4_ITEM_1      ; 84 X
-	const HS_ROCKET_HIDEOUT_4_ITEM_2      ; 85 X
-	const HS_ROCKET_HIDEOUT_4_ITEM_3      ; 86 X
-	const HS_ROCKET_HIDEOUT_4_ITEM_4      ; 87
-	const HS_ROCKET_HIDEOUT_4_ITEM_5      ; 88
-	const HS_SILPH_CO_2F_1                ; 89 XXX never (de)activated?
-	const HS_SILPH_CO_2F_2                ; 8A
-	const HS_SILPH_CO_2F_3                ; 8B
-	const HS_SILPH_CO_2F_4                ; 8C
-	const HS_SILPH_CO_2F_5                ; 8D
-	const HS_SILPH_CO_3F_1                ; 8E
-	const HS_SILPH_CO_3F_2                ; 8F
-	const HS_SILPH_CO_3F_ITEM             ; 90 X
-	const HS_SILPH_CO_4F_1                ; 91
-	const HS_SILPH_CO_4F_2                ; 92
-	const HS_SILPH_CO_4F_3                ; 93
-	const HS_SILPH_CO_4F_ITEM_1           ; 94 X
-	const HS_SILPH_CO_4F_ITEM_2           ; 95 X
-	const HS_SILPH_CO_4F_ITEM_3           ; 96 X
-	const HS_SILPH_CO_5F_1                ; 97
-	const HS_SILPH_CO_5F_2                ; 98
-	const HS_SILPH_CO_5F_3                ; 99
-	const HS_SILPH_CO_5F_4                ; 9A
-	const HS_SILPH_CO_5F_ITEM_1           ; 9B X
-	const HS_SILPH_CO_5F_ITEM_2           ; 9C X
-	const HS_SILPH_CO_5F_ITEM_3           ; 9D X
-	const HS_SILPH_CO_6F_1                ; 9E
-	const HS_SILPH_CO_6F_2                ; 9F
-	const HS_SILPH_CO_6F_3                ; A0
-	const HS_SILPH_CO_6F_ITEM_1           ; A1 X
-	const HS_SILPH_CO_6F_ITEM_2           ; A2 X
-	const HS_SILPH_CO_7F_1                ; A3
-	const HS_SILPH_CO_7F_2                ; A4
-	const HS_SILPH_CO_7F_3                ; A5
-	const HS_SILPH_CO_7F_4                ; A6
-	const HS_SILPH_CO_7F_RIVAL            ; A7
-	const HS_SILPH_CO_7F_ITEM_1           ; A8 X
-	const HS_SILPH_CO_7F_ITEM_2           ; A9 X
-	const HS_SILPH_CO_7F_8                ; AA XXX sprite doesn't exist
-	const HS_SILPH_CO_8F_1                ; AB
-	const HS_SILPH_CO_8F_2                ; AC
-	const HS_SILPH_CO_8F_3                ; AD
-	const HS_SILPH_CO_9F_1                ; AE
-	const HS_SILPH_CO_9F_2                ; AF
-	const HS_SILPH_CO_9F_3                ; B0
-	const HS_SILPH_CO_10F_1               ; B1
-	const HS_SILPH_CO_10F_2               ; B2
-	const HS_SILPH_CO_10F_3               ; B3 XXX never (de)activated?
-	const HS_SILPH_CO_10F_ITEM_1          ; B4 X
-	const HS_SILPH_CO_10F_ITEM_2          ; B5 X
-	const HS_SILPH_CO_10F_ITEM_3          ; B6 X
-	const HS_SILPH_CO_11F_1               ; B7
-	const HS_SILPH_CO_11F_2               ; B8
-	const HS_SILPH_CO_11F_3               ; B9
-	const HS_MAP_F4_1                     ; BA XXX sprite doesn't exist
-	const HS_MANSION_2_ITEM               ; BB X
-	const HS_MANSION_3_ITEM_1             ; BC X
-	const HS_MANSION_3_ITEM_2             ; BD X
-	const HS_MANSION_4_ITEM_1             ; BE X
-	const HS_MANSION_4_ITEM_2             ; BF X
-	const HS_MANSION_4_ITEM_3             ; C0 X
-	const HS_MANSION_4_ITEM_4             ; C1 X
-	const HS_MANSION_4_ITEM_5             ; C2 X
-	const HS_SAFARI_ZONE_EAST_ITEM_1      ; C3 X
-	const HS_SAFARI_ZONE_EAST_ITEM_2      ; C4 X
-	const HS_SAFARI_ZONE_EAST_ITEM_3      ; C5 X
-	const HS_SAFARI_ZONE_EAST_ITEM_4      ; C6 X
-	const HS_SAFARI_ZONE_NORTH_ITEM_1     ; C7 X
-	const HS_SAFARI_ZONE_NORTH_ITEM_2     ; C8 X
-	const HS_SAFARI_ZONE_WEST_ITEM_1      ; C9 X
-	const HS_SAFARI_ZONE_WEST_ITEM_2      ; CA X
-	const HS_SAFARI_ZONE_WEST_ITEM_3      ; CB X
-	const HS_SAFARI_ZONE_WEST_ITEM_4      ; CC X
-	const HS_SAFARI_ZONE_CENTER_ITEM      ; CD X
-	const HS_UNKNOWN_DUNGEON_2_ITEM_1     ; CE X
-	const HS_UNKNOWN_DUNGEON_2_ITEM_2     ; CF X
-	const HS_UNKNOWN_DUNGEON_2_ITEM_3     ; D0 X
-	const HS_MEWTWO                       ; D1 X
-	const HS_UNKNOWN_DUNGEON_3_ITEM_1     ; D2 X
-	const HS_UNKNOWN_DUNGEON_3_ITEM_2     ; D3 X
-	const HS_VICTORY_ROAD_1_ITEM_1        ; D4 X
-	const HS_VICTORY_ROAD_1_ITEM_2        ; D5 X
-	const HS_CHAMPIONS_ROOM_OAK           ; D6
-	const HS_SEAFOAM_ISLANDS_1_BOULDER_1  ; D7
-	const HS_SEAFOAM_ISLANDS_1_BOULDER_2  ; D8
-	const HS_SEAFOAM_ISLANDS_2_BOULDER_1  ; D9
-	const HS_SEAFOAM_ISLANDS_2_BOULDER_2  ; DA
-	const HS_SEAFOAM_ISLANDS_3_BOULDER_1  ; DB
-	const HS_SEAFOAM_ISLANDS_3_BOULDER_2  ; DC
-	const HS_SEAFOAM_ISLANDS_4_BOULDER_1  ; DD
-	const HS_SEAFOAM_ISLANDS_4_BOULDER_2  ; DE
-	const HS_SEAFOAM_ISLANDS_4_BOULDER_3  ; DF
-	const HS_SEAFOAM_ISLANDS_4_BOULDER_4  ; E0
-	const HS_SEAFOAM_ISLANDS_5_BOULDER_1  ; E1
-	const HS_SEAFOAM_ISLANDS_5_BOULDER_2  ; E2
-	const HS_ARTICUNO                     ; E3 X
+	const HS_PALLET_TOWN_OAK               ; 00
+	const HS_LYING_OLD_MAN                 ; 01
+	const HS_OLD_MAN                       ; 02
+	const HS_MUSEUM_GUY                    ; 03
+	const HS_GYM_GUY                       ; 04
+	const HS_CERULEAN_RIVAL                ; 05
+	const HS_CERULEAN_ROCKET               ; 06
+	const HS_CERULEAN_GUARD_1              ; 07
+	const HS_UNKNOWN_DUNGEON_GUY           ; 08
+	const HS_CERULEAN_GUARD_2              ; 09
+	const HS_SAFFRON_CITY_1                ; 0A
+	const HS_SAFFRON_CITY_2                ; 0B
+	const HS_SAFFRON_CITY_3                ; 0C
+	const HS_SAFFRON_CITY_4                ; 0D
+	const HS_SAFFRON_CITY_5                ; 0E
+	const HS_SAFFRON_CITY_6                ; 0F
+	const HS_SAFFRON_CITY_7                ; 10
+	const HS_SAFFRON_CITY_8                ; 11
+	const HS_SAFFRON_CITY_9                ; 12
+	const HS_SAFFRON_CITY_A                ; 13
+	const HS_SAFFRON_CITY_B                ; 14
+	const HS_SAFFRON_CITY_C                ; 15
+	const HS_SAFFRON_CITY_D                ; 16
+	const HS_SAFFRON_CITY_E                ; 17
+	const HS_SAFFRON_CITY_F                ; 18
+	const HS_ROUTE_2_ITEM_1                ; 19 X
+	const HS_ROUTE_2_ITEM_2                ; 1A X
+	const HS_ROUTE_4_ITEM                  ; 1B X
+	const HS_ROUTE_9_ITEM                  ; 1C X
+	const HS_ROUTE_12_SNORLAX              ; 1D
+	const HS_ROUTE_12_ITEM_1               ; 1E X
+	const HS_ROUTE_12_ITEM_2               ; 1F X
+	const HS_ROUTE_15_ITEM                 ; 20 X
+	const HS_ROUTE_16_SNORLAX              ; 21
+	const HS_ROUTE_22_RIVAL_1              ; 22
+	const HS_ROUTE_22_RIVAL_2              ; 23
+	const HS_NUGGET_BRIDGE_GUY             ; 24
+	const HS_ROUTE_24_ITEM                 ; 25 X
+	const HS_ROUTE_25_ITEM                 ; 26 X
+	const HS_DAISY_SITTING                 ; 27
+	const HS_DAISY_WALKING                 ; 28
+	const HS_TOWN_MAP                      ; 29
+	const HS_OAKS_LAB_RIVAL                ; 2A
+	const HS_STARTER_BALL_1                ; 2B
+	const HS_STARTER_BALL_2                ; 2C
+	const HS_STARTER_BALL_3                ; 2D
+	const HS_OAKS_LAB_OAK_1                ; 2E
+	const HS_POKEDEX_1                     ; 2F
+	const HS_POKEDEX_2                     ; 30
+	const HS_OAKS_LAB_OAK_2                ; 31
+	const HS_VIRIDIAN_GYM_GIOVANNI         ; 32
+	const HS_VIRIDIAN_GYM_ITEM             ; 33 X
+	const HS_OLD_AMBER                     ; 34
+	const HS_CERULEAN_CAVE_1F_ITEM_1       ; 35 X
+	const HS_CERULEAN_CAVE_1F_ITEM_2       ; 36 X
+	const HS_CERULEAN_CAVE_1F_ITEM_3       ; 37 X
+	const HS_POKEMON_TOWER_2F_RIVAL        ; 38
+	const HS_POKEMON_TOWER_3F_ITEM         ; 39 X
+	const HS_POKEMON_TOWER_4F_ITEM_1       ; 3A X
+	const HS_POKEMON_TOWER_4F_ITEM_2       ; 3B X
+	const HS_POKEMON_TOWER_4F_ITEM_3       ; 3C X
+	const HS_POKEMON_TOWER_5F_ITEM         ; 3D X
+	const HS_POKEMON_TOWER_6F_ITEM_1       ; 3E X
+	const HS_POKEMON_TOWER_6F_ITEM_2       ; 3F X
+	const HS_POKEMON_TOWER_7F_ROCKET_1     ; 40 X
+	const HS_POKEMON_TOWER_7F_ROCKET_2     ; 41 X
+	const HS_POKEMON_TOWER_7F_ROCKET_3     ; 42 X
+	const HS_POKEMON_TOWER_7F_MR_FUJI      ; 43
+	const HS_MR_FUJIS_HOUSE_MR_FUJI        ; 44
+	const HS_CELADON_MANSION_EEVEE_GIFT    ; 45
+	const HS_GAME_CORNER_ROCKET            ; 46
+	const HS_WARDENS_HOUSE_ITEM            ; 47 X
+	const HS_POKEMON_MANSION_1F_ITEM_1     ; 48 X
+	const HS_POKEMON_MANSION_1F_ITEM_2     ; 49 X
+	const HS_FIGHTING_DOJO_GIFT_1          ; 4A
+	const HS_FIGHTING_DOJO_GIFT_2          ; 4B
+	const HS_SILPH_CO_1F_RECEPTIONIST      ; 4C
+	const HS_VOLTORB_1                     ; 4D X
+	const HS_VOLTORB_2                     ; 4E X
+	const HS_VOLTORB_3                     ; 4F X
+	const HS_ELECTRODE_1                   ; 50 X
+	const HS_VOLTORB_4                     ; 51 X
+	const HS_VOLTORB_5                     ; 52 X
+	const HS_ELECTRODE_2                   ; 53 X
+	const HS_VOLTORB_6                     ; 54 X
+	const HS_ZAPDOS                        ; 55 X
+	const HS_POWER_PLANT_ITEM_1            ; 56 X
+	const HS_POWER_PLANT_ITEM_2            ; 57 X
+	const HS_POWER_PLANT_ITEM_3            ; 58 X
+	const HS_POWER_PLANT_ITEM_4            ; 59 X
+	const HS_POWER_PLANT_ITEM_5            ; 5A X
+	const HS_MOLTRES                       ; 5B X
+	const HS_VICTORY_ROAD_2F_ITEM_1        ; 5C X
+	const HS_VICTORY_ROAD_2F_ITEM_2        ; 5D X
+	const HS_VICTORY_ROAD_2F_ITEM_3        ; 5E X
+	const HS_VICTORY_ROAD_2F_ITEM_4        ; 5F X
+	const HS_VICTORY_ROAD_2F_BOULDER       ; 60
+	const HS_BILL_POKEMON                  ; 61
+	const HS_BILL_1                        ; 62
+	const HS_BILL_2                        ; 63
+	const HS_VIRIDIAN_FOREST_ITEM_1        ; 64 X
+	const HS_VIRIDIAN_FOREST_ITEM_2        ; 65 X
+	const HS_VIRIDIAN_FOREST_ITEM_3        ; 66 X
+	const HS_MT_MOON_1F_ITEM_1             ; 67 X
+	const HS_MT_MOON_1F_ITEM_2             ; 68 X
+	const HS_MT_MOON_1F_ITEM_3             ; 69 X
+	const HS_MT_MOON_1F_ITEM_4             ; 6A X
+	const HS_MT_MOON_1F_ITEM_5             ; 6B X
+	const HS_MT_MOON_1F_ITEM_6             ; 6C X
+	const HS_MT_MOON_B2F_FOSSIL_1          ; 6D
+	const HS_MT_MOON_B2F_FOSSIL_2          ; 6E
+	const HS_MT_MOON_B2F_ITEM_1            ; 6F X
+	const HS_MT_MOON_B2F_ITEM_2            ; 70 X
+	const HS_SS_ANNE_2F_RIVAL              ; 71
+	const HS_SS_ANNE_1F_ROOMS_ITEM         ; 72 X
+	const HS_SS_ANNE_2F_ROOMS_ITEM_1       ; 73 X
+	const HS_SS_ANNE_2F_ROOMS_ITEM_2       ; 74 X
+	const HS_SS_ANNE_B1F_ROOMS_ITEM_1      ; 75 X
+	const HS_SS_ANNE_B1F_ROOMS_ITEM_2      ; 76 X
+	const HS_SS_ANNE_B1F_ROOMS_ITEM_3      ; 77 X
+	const HS_VICTORY_ROAD_3F_ITEM_1        ; 78 X
+	const HS_VICTORY_ROAD_3F_ITEM_2        ; 79 X
+	const HS_VICTORY_ROAD_3F_BOULDER       ; 7A
+	const HS_ROCKET_HIDEOUT_B1F_ITEM_1     ; 7B X
+	const HS_ROCKET_HIDEOUT_B1F_ITEM_2     ; 7C X
+	const HS_ROCKET_HIDEOUT_B2F_ITEM_1     ; 7D X
+	const HS_ROCKET_HIDEOUT_B2F_ITEM_2     ; 7E X
+	const HS_ROCKET_HIDEOUT_B2F_ITEM_3     ; 7F X
+	const HS_ROCKET_HIDEOUT_B2F_ITEM_4     ; 80 X
+	const HS_ROCKET_HIDEOUT_B3F_ITEM_1     ; 81 X
+	const HS_ROCKET_HIDEOUT_B3F_ITEM_2     ; 82 X
+	const HS_ROCKET_HIDEOUT_B4F_GIOVANNI   ; 83
+	const HS_ROCKET_HIDEOUT_B4F_ITEM_1     ; 84 X
+	const HS_ROCKET_HIDEOUT_B4F_ITEM_2     ; 85 X
+	const HS_ROCKET_HIDEOUT_B4F_ITEM_3     ; 86 X
+	const HS_ROCKET_HIDEOUT_B4F_ITEM_4     ; 87
+	const HS_ROCKET_HIDEOUT_B4F_ITEM_5     ; 88
+	const HS_SILPH_CO_2F_1                 ; 89 XXX never (de)activated?
+	const HS_SILPH_CO_2F_2                 ; 8A
+	const HS_SILPH_CO_2F_3                 ; 8B
+	const HS_SILPH_CO_2F_4                 ; 8C
+	const HS_SILPH_CO_2F_5                 ; 8D
+	const HS_SILPH_CO_3F_1                 ; 8E
+	const HS_SILPH_CO_3F_2                 ; 8F
+	const HS_SILPH_CO_3F_ITEM              ; 90 X
+	const HS_SILPH_CO_4F_1                 ; 91
+	const HS_SILPH_CO_4F_2                 ; 92
+	const HS_SILPH_CO_4F_3                 ; 93
+	const HS_SILPH_CO_4F_ITEM_1            ; 94 X
+	const HS_SILPH_CO_4F_ITEM_2            ; 95 X
+	const HS_SILPH_CO_4F_ITEM_3            ; 96 X
+	const HS_SILPH_CO_5F_1                 ; 97
+	const HS_SILPH_CO_5F_2                 ; 98
+	const HS_SILPH_CO_5F_3                 ; 99
+	const HS_SILPH_CO_5F_4                 ; 9A
+	const HS_SILPH_CO_5F_ITEM_1            ; 9B X
+	const HS_SILPH_CO_5F_ITEM_2            ; 9C X
+	const HS_SILPH_CO_5F_ITEM_3            ; 9D X
+	const HS_SILPH_CO_6F_1                 ; 9E
+	const HS_SILPH_CO_6F_2                 ; 9F
+	const HS_SILPH_CO_6F_3                 ; A0
+	const HS_SILPH_CO_6F_ITEM_1            ; A1 X
+	const HS_SILPH_CO_6F_ITEM_2            ; A2 X
+	const HS_SILPH_CO_7F_1                 ; A3
+	const HS_SILPH_CO_7F_2                 ; A4
+	const HS_SILPH_CO_7F_3                 ; A5
+	const HS_SILPH_CO_7F_4                 ; A6
+	const HS_SILPH_CO_7F_RIVAL             ; A7
+	const HS_SILPH_CO_7F_ITEM_1            ; A8 X
+	const HS_SILPH_CO_7F_ITEM_2            ; A9 X
+	const HS_SILPH_CO_7F_8                 ; AA XXX sprite doesn't exist
+	const HS_SILPH_CO_8F_1                 ; AB
+	const HS_SILPH_CO_8F_2                 ; AC
+	const HS_SILPH_CO_8F_3                 ; AD
+	const HS_SILPH_CO_9F_1                 ; AE
+	const HS_SILPH_CO_9F_2                 ; AF
+	const HS_SILPH_CO_9F_3                 ; B0
+	const HS_SILPH_CO_10F_1                ; B1
+	const HS_SILPH_CO_10F_2                ; B2
+	const HS_SILPH_CO_10F_3                ; B3 XXX never (de)activated?
+	const HS_SILPH_CO_10F_ITEM_1           ; B4 X
+	const HS_SILPH_CO_10F_ITEM_2           ; B5 X
+	const HS_SILPH_CO_10F_ITEM_3           ; B6 X
+	const HS_SILPH_CO_11F_1                ; B7
+	const HS_SILPH_CO_11F_2                ; B8
+	const HS_SILPH_CO_11F_3                ; B9
+	const HS_UNUSED_MAP_F4_1               ; BA XXX sprite doesn't exist
+	const HS_POKEMON_MANSION_2F_ITEM       ; BB X
+	const HS_POKEMON_MANSION_3F_ITEM_1     ; BC X
+	const HS_POKEMON_MANSION_3F_ITEM_2     ; BD X
+	const HS_POKEMON_MANSION_B1F_ITEM_1    ; BE X
+	const HS_POKEMON_MANSION_B1F_ITEM_2    ; BF X
+	const HS_POKEMON_MANSION_B1F_ITEM_3    ; C0 X
+	const HS_POKEMON_MANSION_B1F_ITEM_4    ; C1 X
+	const HS_POKEMON_MANSION_B1F_ITEM_5    ; C2 X
+	const HS_SAFARI_ZONE_EAST_ITEM_1       ; C3 X
+	const HS_SAFARI_ZONE_EAST_ITEM_2       ; C4 X
+	const HS_SAFARI_ZONE_EAST_ITEM_3       ; C5 X
+	const HS_SAFARI_ZONE_EAST_ITEM_4       ; C6 X
+	const HS_SAFARI_ZONE_NORTH_ITEM_1      ; C7 X
+	const HS_SAFARI_ZONE_NORTH_ITEM_2      ; C8 X
+	const HS_SAFARI_ZONE_WEST_ITEM_1       ; C9 X
+	const HS_SAFARI_ZONE_WEST_ITEM_2       ; CA X
+	const HS_SAFARI_ZONE_WEST_ITEM_3       ; CB X
+	const HS_SAFARI_ZONE_WEST_ITEM_4       ; CC X
+	const HS_SAFARI_ZONE_CENTER_ITEM       ; CD X
+	const HS_CERULEAN_CAVE_2F_ITEM_1       ; CE X
+	const HS_CERULEAN_CAVE_2F_ITEM_2       ; CF X
+	const HS_CERULEAN_CAVE_2F_ITEM_3       ; D0 X
+	const HS_MEWTWO                        ; D1 X
+	const HS_CERULEAN_CAVE_B1F_ITEM_1      ; D2 X
+	const HS_CERULEAN_CAVE_B1F_ITEM_2      ; D3 X
+	const HS_VICTORY_ROAD_1F_ITEM_1        ; D4 X
+	const HS_VICTORY_ROAD_1F_ITEM_2        ; D5 X
+	const HS_CHAMPIONS_ROOM_OAK            ; D6
+	const HS_SEAFOAM_ISLANDS_1F_BOULDER_1  ; D7
+	const HS_SEAFOAM_ISLANDS_1F_BOULDER_2  ; D8
+	const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; D9
+	const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; DA
+	const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; DB
+	const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; DC
+	const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; DD
+	const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; DE
+	const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; DF
+	const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; E0
+	const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; E1
+	const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; E2
+	const HS_ARTICUNO                      ; E3 X
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index cbedef3f..3ddc5746 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -5,251 +5,251 @@ mapconst: MACRO
 ENDM
 
 	const_def
-	mapconst PALLET_TOWN,                 9, 10 ; $00
-	mapconst VIRIDIAN_CITY,              18, 20 ; $01
-	mapconst PEWTER_CITY,                18, 20 ; $02
-	mapconst CERULEAN_CITY,              18, 20 ; $03
-	mapconst LAVENDER_TOWN,               9, 10 ; $04
-	mapconst VERMILION_CITY,             18, 20 ; $05
-	mapconst CELADON_CITY,               18, 25 ; $06
-	mapconst FUCHSIA_CITY,               18, 20 ; $07
-	mapconst CINNABAR_ISLAND,             9, 10 ; $08
-	mapconst INDIGO_PLATEAU,              9, 10 ; $09
-	mapconst SAFFRON_CITY,               18, 20 ; $0A
-	mapconst UNUSED_MAP_0B,               0,  0 ; $0B
-	mapconst ROUTE_1,                    18, 10 ; $0C
-	mapconst ROUTE_2,                    36, 10 ; $0D
-	mapconst ROUTE_3,                     9, 35 ; $0E
-	mapconst ROUTE_4,                     9, 45 ; $0F
-	mapconst ROUTE_5,                    18, 10 ; $10
-	mapconst ROUTE_6,                    18, 10 ; $11
-	mapconst ROUTE_7,                     9, 10 ; $12
-	mapconst ROUTE_8,                     9, 30 ; $13
-	mapconst ROUTE_9,                     9, 30 ; $14
-	mapconst ROUTE_10,                   36, 10 ; $15
-	mapconst ROUTE_11,                    9, 30 ; $16
-	mapconst ROUTE_12,                   54, 10 ; $17
-	mapconst ROUTE_13,                    9, 30 ; $18
-	mapconst ROUTE_14,                   27, 10 ; $19
-	mapconst ROUTE_15,                    9, 30 ; $1A
-	mapconst ROUTE_16,                    9, 20 ; $1B
-	mapconst ROUTE_17,                   72, 10 ; $1C
-	mapconst ROUTE_18,                    9, 25 ; $1D
-	mapconst ROUTE_19,                   27, 10 ; $1E
-	mapconst ROUTE_20,                    9, 50 ; $1F
-	mapconst ROUTE_21,                   45, 10 ; $20
-	mapconst ROUTE_22,                    9, 20 ; $21
-	mapconst ROUTE_23,                   72, 10 ; $22
-	mapconst ROUTE_24,                   18, 10 ; $23
-	mapconst ROUTE_25,                    9, 30 ; $24
-	mapconst REDS_HOUSE_1F,               4,  4 ; $25
-	mapconst REDS_HOUSE_2F,               4,  4 ; $26
-	mapconst BLUES_HOUSE,                 4,  4 ; $27
-	mapconst OAKS_LAB,                    6,  5 ; $28
-	mapconst VIRIDIAN_POKECENTER,         4,  7 ; $29
-	mapconst VIRIDIAN_MART,               4,  4 ; $2A
-	mapconst VIRIDIAN_SCHOOL,             4,  4 ; $2B
-	mapconst VIRIDIAN_HOUSE,              4,  4 ; $2C
-	mapconst VIRIDIAN_GYM,                9, 10 ; $2D
-	mapconst DIGLETTS_CAVE_EXIT,          4,  4 ; $2E
-	mapconst VIRIDIAN_FOREST_EXIT,        4,  5 ; $2F
-	mapconst ROUTE_2_HOUSE,               4,  4 ; $30
-	mapconst ROUTE_2_GATE,                4,  5 ; $31
-	mapconst VIRIDIAN_FOREST_ENTRANCE,    4,  5 ; $32
-	mapconst VIRIDIAN_FOREST,            24, 17 ; $33
-	mapconst MUSEUM_1F,                   4, 10 ; $34
-	mapconst MUSEUM_2F,                   4,  7 ; $35
-	mapconst PEWTER_GYM,                  7,  5 ; $36
-	mapconst PEWTER_HOUSE_1,              4,  4 ; $37
-	mapconst PEWTER_MART,                 4,  4 ; $38
-	mapconst PEWTER_HOUSE_2,              4,  4 ; $39
-	mapconst PEWTER_POKECENTER,           4,  7 ; $3A
-	mapconst MT_MOON_1,                  18, 20 ; $3B
-	mapconst MT_MOON_2,                  14, 14 ; $3C
-	mapconst MT_MOON_3,                  18, 20 ; $3D
-	mapconst TRASHED_HOUSE,               4,  4 ; $3E
-	mapconst CERULEAN_HOUSE_1,            4,  4 ; $3F
-	mapconst CERULEAN_POKECENTER,         4,  7 ; $40
-	mapconst CERULEAN_GYM,                7,  5 ; $41
-	mapconst BIKE_SHOP,                   4,  4 ; $42
-	mapconst CERULEAN_MART,               4,  4 ; $43
-	mapconst MT_MOON_POKECENTER,          4,  7 ; $44
-	mapconst TRASHED_HOUSE_COPY,          4,  4 ; $45
-	mapconst ROUTE_5_GATE,                3,  4 ; $46
-	mapconst PATH_ENTRANCE_ROUTE_5,       4,  4 ; $47
-	mapconst DAYCAREM,                    4,  4 ; $48
-	mapconst ROUTE_6_GATE,                3,  4 ; $49
-	mapconst PATH_ENTRANCE_ROUTE_6,       4,  4 ; $4A
-	mapconst PATH_ENTRANCE_ROUTE_6_COPY,  4,  4 ; $4B
-	mapconst ROUTE_7_GATE,                4,  3 ; $4C
-	mapconst PATH_ENTRANCE_ROUTE_7,       4,  4 ; $4D
-	mapconst PATH_ENTRANCE_ROUTE_7_COPY,  4,  4 ; $4E
-	mapconst ROUTE_8_GATE,                4,  3 ; $4F
-	mapconst PATH_ENTRANCE_ROUTE_8,       4,  4 ; $50
-	mapconst ROCK_TUNNEL_POKECENTER,      4,  7 ; $51
-	mapconst ROCK_TUNNEL_1,              18, 20 ; $52
-	mapconst POWER_PLANT,                18, 20 ; $53
-	mapconst ROUTE_11_GATE_1F,            5,  4 ; $54
-	mapconst DIGLETTS_CAVE_ENTRANCE,      4,  4 ; $55
-	mapconst ROUTE_11_GATE_2F,            4,  4 ; $56
-	mapconst ROUTE_12_GATE_1F,            4,  5 ; $57
-	mapconst BILLS_HOUSE,                 4,  4 ; $58
-	mapconst VERMILION_POKECENTER,        4,  7 ; $59
-	mapconst POKEMON_FAN_CLUB,            4,  4 ; $5A
-	mapconst VERMILION_MART,              4,  4 ; $5B
-	mapconst VERMILION_GYM,               9,  5 ; $5C
-	mapconst VERMILION_HOUSE_1,           4,  4 ; $5D
-	mapconst VERMILION_DOCK,              6, 14 ; $5E
-	mapconst SS_ANNE_1,                   9, 20 ; $5F
-	mapconst SS_ANNE_2,                   9, 20 ; $60
-	mapconst SS_ANNE_3,                   3, 10 ; $61
-	mapconst SS_ANNE_4,                   4, 15 ; $62
-	mapconst SS_ANNE_5,                   7, 10 ; $63
-	mapconst SS_ANNE_6,                   8,  7 ; $64
-	mapconst SS_ANNE_7,                   4,  3 ; $65
-	mapconst SS_ANNE_8,                   8, 12 ; $66
-	mapconst SS_ANNE_9,                   8, 12 ; $67
-	mapconst SS_ANNE_10,                  8, 12 ; $68
-	mapconst UNUSED_MAP_69,               0,  0 ; $69
-	mapconst UNUSED_MAP_6A,               0,  0 ; $6A
-	mapconst UNUSED_MAP_6B,               0,  0 ; $6B
-	mapconst VICTORY_ROAD_1,              9, 10 ; $6C
-	mapconst UNUSED_MAP_6D,               0,  0 ; $6D
-	mapconst UNUSED_MAP_6E,               0,  0 ; $6E
-	mapconst UNUSED_MAP_6F,               0,  0 ; $6F
-	mapconst UNUSED_MAP_70,               0,  0 ; $70
-	mapconst LANCES_ROOM,                13, 13 ; $71
-	mapconst UNUSED_MAP_72,               0,  0 ; $72
-	mapconst UNUSED_MAP_73,               0,  0 ; $73
-	mapconst UNUSED_MAP_74,               0,  0 ; $74
-	mapconst UNUSED_MAP_75,               0,  0 ; $75
-	mapconst HALL_OF_FAME,                4,  5 ; $76
-	mapconst UNDERGROUND_PATH_NS,        24,  4 ; $77
-	mapconst CHAMPIONS_ROOM,              4,  4 ; $78
-	mapconst UNDERGROUND_PATH_WE,         4, 25 ; $79
-	mapconst CELADON_MART_1,              4, 10 ; $7A
-	mapconst CELADON_MART_2,              4, 10 ; $7B
-	mapconst CELADON_MART_3,              4, 10 ; $7C
-	mapconst CELADON_MART_4,              4, 10 ; $7D
-	mapconst CELADON_MART_ROOF,           4, 10 ; $7E
-	mapconst CELADON_MART_ELEVATOR,       2,  2 ; $7F
-	mapconst CELADON_MANSION_1,           6,  4 ; $80
-	mapconst CELADON_MANSION_2,           6,  4 ; $81
-	mapconst CELADON_MANSION_3,           6,  4 ; $82
-	mapconst CELADON_MANSION_4,           6,  4 ; $83
-	mapconst CELADON_MANSION_5,           4,  4 ; $84
-	mapconst CELADON_POKECENTER,          4,  7 ; $85
-	mapconst CELADON_GYM,                 9,  5 ; $86
-	mapconst GAME_CORNER,                 9, 10 ; $87
-	mapconst CELADON_MART_5,              4, 10 ; $88
-	mapconst CELADON_PRIZE_ROOM,          4,  5 ; $89
-	mapconst CELADON_DINER,               4,  5 ; $8A
-	mapconst CELADON_HOUSE,               4,  4 ; $8B
-	mapconst CELADON_HOTEL,               4,  7 ; $8C
-	mapconst LAVENDER_POKECENTER,         4,  7 ; $8D
-	mapconst POKEMONTOWER_1,              9, 10 ; $8E
-	mapconst POKEMONTOWER_2,              9, 10 ; $8F
-	mapconst POKEMONTOWER_3,              9, 10 ; $90
-	mapconst POKEMONTOWER_4,              9, 10 ; $91
-	mapconst POKEMONTOWER_5,              9, 10 ; $92
-	mapconst POKEMONTOWER_6,              9, 10 ; $93
-	mapconst POKEMONTOWER_7,              9, 10 ; $94
-	mapconst LAVENDER_HOUSE_1,            4,  4 ; $95
-	mapconst LAVENDER_MART,               4,  4 ; $96
-	mapconst LAVENDER_HOUSE_2,            4,  4 ; $97
-	mapconst FUCHSIA_MART,                4,  4 ; $98
-	mapconst FUCHSIA_HOUSE_1,             4,  4 ; $99
-	mapconst FUCHSIA_POKECENTER,          4,  7 ; $9A
-	mapconst FUCHSIA_HOUSE_2,             4,  5 ; $9B
-	mapconst SAFARI_ZONE_ENTRANCE,        3,  4 ; $9C
-	mapconst FUCHSIA_GYM,                 9,  5 ; $9D
-	mapconst FUCHSIA_MEETING_ROOM,        4,  7 ; $9E
-	mapconst SEAFOAM_ISLANDS_2,           9, 15 ; $9F
-	mapconst SEAFOAM_ISLANDS_3,           9, 15 ; $A0
-	mapconst SEAFOAM_ISLANDS_4,           9, 15 ; $A1
-	mapconst SEAFOAM_ISLANDS_5,           9, 15 ; $A2
-	mapconst VERMILION_HOUSE_2,           4,  4 ; $A3
-	mapconst FUCHSIA_HOUSE_3,             4,  4 ; $A4
-	mapconst MANSION_1,                  14, 15 ; $A5
-	mapconst CINNABAR_GYM,                9, 10 ; $A6
-	mapconst CINNABAR_LAB_1,              4,  9 ; $A7
-	mapconst CINNABAR_LAB_2,              4,  4 ; $A8
-	mapconst CINNABAR_LAB_3,              4,  4 ; $A9
-	mapconst CINNABAR_LAB_4,              4,  4 ; $AA
-	mapconst CINNABAR_POKECENTER,         4,  7 ; $AB
-	mapconst CINNABAR_MART,               4,  4 ; $AC
-	mapconst CINNABAR_MART_COPY,          4,  4 ; $AD
-	mapconst INDIGO_PLATEAU_LOBBY,        6,  8 ; $AE
-	mapconst COPYCATS_HOUSE_1F,           4,  4 ; $AF
-	mapconst COPYCATS_HOUSE_2F,           4,  4 ; $B0
-	mapconst FIGHTING_DOJO,               6,  5 ; $B1
-	mapconst SAFFRON_GYM,                 9, 10 ; $B2
-	mapconst SAFFRON_HOUSE_1,             4,  4 ; $B3
-	mapconst SAFFRON_MART,                4,  4 ; $B4
-	mapconst SILPH_CO_1F,                 9, 15 ; $B5
-	mapconst SAFFRON_POKECENTER,          4,  7 ; $B6
-	mapconst SAFFRON_HOUSE_2,             4,  4 ; $B7
-	mapconst ROUTE_15_GATE_1F,            5,  4 ; $B8
-	mapconst ROUTE_15_GATE_2F,            4,  4 ; $B9
-	mapconst ROUTE_16_GATE_1F,            7,  4 ; $BA
-	mapconst ROUTE_16_GATE_2F,            4,  4 ; $BB
-	mapconst ROUTE_16_HOUSE,              4,  4 ; $BC
-	mapconst ROUTE_12_HOUSE,              4,  4 ; $BD
-	mapconst ROUTE_18_GATE_1F,            5,  4 ; $BE
-	mapconst ROUTE_18_GATE_2F,            4,  4 ; $BF
-	mapconst SEAFOAM_ISLANDS_1,           9, 15 ; $C0
-	mapconst ROUTE_22_GATE,               4,  5 ; $C1
-	mapconst VICTORY_ROAD_2,              9, 15 ; $C2
-	mapconst ROUTE_12_GATE_2F,            4,  4 ; $C3
-	mapconst VERMILION_HOUSE_3,           4,  4 ; $C4
-	mapconst DIGLETTS_CAVE,              18, 20 ; $C5
-	mapconst VICTORY_ROAD_3,              9, 15 ; $C6
-	mapconst ROCKET_HIDEOUT_1,           14, 15 ; $C7
-	mapconst ROCKET_HIDEOUT_2,           14, 15 ; $C8
-	mapconst ROCKET_HIDEOUT_3,           14, 15 ; $C9
-	mapconst ROCKET_HIDEOUT_4,           12, 15 ; $CA
-	mapconst ROCKET_HIDEOUT_ELEVATOR,     4,  3 ; $CB
-	mapconst UNUSED_MAP_CC,               0,  0 ; $CC
-	mapconst UNUSED_MAP_CD,               0,  0 ; $CD
-	mapconst UNUSED_MAP_CE,               0,  0 ; $CE
-	mapconst SILPH_CO_2F,                 9, 15 ; $CF
-	mapconst SILPH_CO_3F,                 9, 15 ; $D0
-	mapconst SILPH_CO_4F,                 9, 15 ; $D1
-	mapconst SILPH_CO_5F,                 9, 15 ; $D2
-	mapconst SILPH_CO_6F,                 9, 13 ; $D3
-	mapconst SILPH_CO_7F,                 9, 13 ; $D4
-	mapconst SILPH_CO_8F,                 9, 13 ; $D5
-	mapconst MANSION_2,                  14, 15 ; $D6
-	mapconst MANSION_3,                   9, 15 ; $D7
-	mapconst MANSION_4,                  14, 15 ; $D8
-	mapconst SAFARI_ZONE_EAST,           13, 15 ; $D9
-	mapconst SAFARI_ZONE_NORTH,          18, 20 ; $DA
-	mapconst SAFARI_ZONE_WEST,           13, 15 ; $DB
-	mapconst SAFARI_ZONE_CENTER,         13, 15 ; $DC
-	mapconst SAFARI_ZONE_REST_HOUSE_1,    4,  4 ; $DD
-	mapconst SAFARI_ZONE_SECRET_HOUSE,    4,  4 ; $DE
-	mapconst SAFARI_ZONE_REST_HOUSE_2,    4,  4 ; $DF
-	mapconst SAFARI_ZONE_REST_HOUSE_3,    4,  4 ; $E0
-	mapconst SAFARI_ZONE_REST_HOUSE_4,    4,  4 ; $E1
-	mapconst UNKNOWN_DUNGEON_2,           9, 15 ; $E2
-	mapconst UNKNOWN_DUNGEON_3,           9, 15 ; $E3
-	mapconst UNKNOWN_DUNGEON_1,           9, 15 ; $E4
-	mapconst NAME_RATERS_HOUSE,           4,  4 ; $E5
-	mapconst CERULEAN_HOUSE_2,            4,  4 ; $E6
-	mapconst UNUSED_MAP_E7,               0,  0 ; $E7
-	mapconst ROCK_TUNNEL_2,              18, 20 ; $E8
-	mapconst SILPH_CO_9F,                 9, 13 ; $E9
-	mapconst SILPH_CO_10F,                9,  8 ; $EA
-	mapconst SILPH_CO_11F,                9,  9 ; $EB
-	mapconst SILPH_CO_ELEVATOR,           2,  2 ; $EC
-	mapconst UNUSED_MAP_ED,               0,  0 ; $ED
-	mapconst UNUSED_MAP_EE,               0,  0 ; $EE
-	mapconst TRADE_CENTER,                4,  5 ; $EF
-	mapconst COLOSSEUM,                   4,  5 ; $F0
-	mapconst UNUSED_MAP_F1,               0,  0 ; $F1
-	mapconst UNUSED_MAP_F2,               0,  0 ; $F2
-	mapconst UNUSED_MAP_F3,               0,  0 ; $F3
-	mapconst UNUSED_MAP_F4,               0,  0 ; $F4
-	mapconst LORELEIS_ROOM,               6,  5 ; $F5
-	mapconst BRUNOS_ROOM,                 6,  5 ; $F6
-	mapconst AGATHAS_ROOM,                6,  5 ; $F7
+	mapconst PALLET_TOWN,                    9, 10 ; $00
+	mapconst VIRIDIAN_CITY,                 18, 20 ; $01
+	mapconst PEWTER_CITY,                   18, 20 ; $02
+	mapconst CERULEAN_CITY,                 18, 20 ; $03
+	mapconst LAVENDER_TOWN,                  9, 10 ; $04
+	mapconst VERMILION_CITY,                18, 20 ; $05
+	mapconst CELADON_CITY,                  18, 25 ; $06
+	mapconst FUCHSIA_CITY,                  18, 20 ; $07
+	mapconst CINNABAR_ISLAND,                9, 10 ; $08
+	mapconst INDIGO_PLATEAU,                 9, 10 ; $09
+	mapconst SAFFRON_CITY,                  18, 20 ; $0A
+	mapconst UNUSED_MAP_0B,                  0,  0 ; $0B
+	mapconst ROUTE_1,                       18, 10 ; $0C
+	mapconst ROUTE_2,                       36, 10 ; $0D
+	mapconst ROUTE_3,                        9, 35 ; $0E
+	mapconst ROUTE_4,                        9, 45 ; $0F
+	mapconst ROUTE_5,                       18, 10 ; $10
+	mapconst ROUTE_6,                       18, 10 ; $11
+	mapconst ROUTE_7,                        9, 10 ; $12
+	mapconst ROUTE_8,                        9, 30 ; $13
+	mapconst ROUTE_9,                        9, 30 ; $14
+	mapconst ROUTE_10,                      36, 10 ; $15
+	mapconst ROUTE_11,                       9, 30 ; $16
+	mapconst ROUTE_12,                      54, 10 ; $17
+	mapconst ROUTE_13,                       9, 30 ; $18
+	mapconst ROUTE_14,                      27, 10 ; $19
+	mapconst ROUTE_15,                       9, 30 ; $1A
+	mapconst ROUTE_16,                       9, 20 ; $1B
+	mapconst ROUTE_17,                      72, 10 ; $1C
+	mapconst ROUTE_18,                       9, 25 ; $1D
+	mapconst ROUTE_19,                      27, 10 ; $1E
+	mapconst ROUTE_20,                       9, 50 ; $1F
+	mapconst ROUTE_21,                      45, 10 ; $20
+	mapconst ROUTE_22,                       9, 20 ; $21
+	mapconst ROUTE_23,                      72, 10 ; $22
+	mapconst ROUTE_24,                      18, 10 ; $23
+	mapconst ROUTE_25,                       9, 30 ; $24
+	mapconst REDS_HOUSE_1F,                  4,  4 ; $25
+	mapconst REDS_HOUSE_2F,                  4,  4 ; $26
+	mapconst BLUES_HOUSE,                    4,  4 ; $27
+	mapconst OAKS_LAB,                       6,  5 ; $28
+	mapconst VIRIDIAN_POKECENTER,            4,  7 ; $29
+	mapconst VIRIDIAN_MART,                  4,  4 ; $2A
+	mapconst VIRIDIAN_SCHOOL_HOUSE,          4,  4 ; $2B
+	mapconst VIRIDIAN_NICKNAME_HOUSE,        4,  4 ; $2C
+	mapconst VIRIDIAN_GYM,                   9, 10 ; $2D
+	mapconst DIGLETTS_CAVE_ROUTE_2,          4,  4 ; $2E
+	mapconst VIRIDIAN_FOREST_NORTH_GATE,     4,  5 ; $2F
+	mapconst ROUTE_2_TRADE_HOUSE,            4,  4 ; $30
+	mapconst ROUTE_2_GATE,                   4,  5 ; $31
+	mapconst VIRIDIAN_FOREST_SOUTH_GATE,     4,  5 ; $32
+	mapconst VIRIDIAN_FOREST,               24, 17 ; $33
+	mapconst MUSEUM_1F,                      4, 10 ; $34
+	mapconst MUSEUM_2F,                      4,  7 ; $35
+	mapconst PEWTER_GYM,                     7,  5 ; $36
+	mapconst PEWTER_NIDORAN_HOUSE,           4,  4 ; $37
+	mapconst PEWTER_MART,                    4,  4 ; $38
+	mapconst PEWTER_SPEECH_HOUSE,            4,  4 ; $39
+	mapconst PEWTER_POKECENTER,              4,  7 ; $3A
+	mapconst MT_MOON_1F,                    18, 20 ; $3B
+	mapconst MT_MOON_B1F,                   14, 14 ; $3C
+	mapconst MT_MOON_B2F,                   18, 20 ; $3D
+	mapconst CERULEAN_TRASHED_HOUSE,         4,  4 ; $3E
+	mapconst CERULEAN_TRADE_HOUSE,           4,  4 ; $3F
+	mapconst CERULEAN_POKECENTER,            4,  7 ; $40
+	mapconst CERULEAN_GYM,                   7,  5 ; $41
+	mapconst BIKE_SHOP,                      4,  4 ; $42
+	mapconst CERULEAN_MART,                  4,  4 ; $43
+	mapconst MT_MOON_POKECENTER,             4,  7 ; $44
+	mapconst CERULEAN_TRASHED_HOUSE_COPY,    4,  4 ; $45
+	mapconst ROUTE_5_GATE,                   3,  4 ; $46
+	mapconst UNDERGROUND_PATH_ROUTE_5,       4,  4 ; $47
+	mapconst DAYCARE,                        4,  4 ; $48
+	mapconst ROUTE_6_GATE,                   3,  4 ; $49
+	mapconst UNDERGROUND_PATH_ROUTE_6,       4,  4 ; $4A
+	mapconst UNDERGROUND_PATH_ROUTE_6_COPY,  4,  4 ; $4B
+	mapconst ROUTE_7_GATE,                   4,  3 ; $4C
+	mapconst UNDERGROUND_PATH_ROUTE_7,       4,  4 ; $4D
+	mapconst UNDERGROUND_PATH_ROUTE_7_COPY,  4,  4 ; $4E
+	mapconst ROUTE_8_GATE,                   4,  3 ; $4F
+	mapconst UNDERGROUND_PATH_ROUTE_8,       4,  4 ; $50
+	mapconst ROCK_TUNNEL_POKECENTER,         4,  7 ; $51
+	mapconst ROCK_TUNNEL_1F,                18, 20 ; $52
+	mapconst POWER_PLANT,                   18, 20 ; $53
+	mapconst ROUTE_11_GATE_1F,               5,  4 ; $54
+	mapconst DIGLETTS_CAVE_ROUTE_11,         4,  4 ; $55
+	mapconst ROUTE_11_GATE_2F,               4,  4 ; $56
+	mapconst ROUTE_12_GATE_1F,               4,  5 ; $57
+	mapconst BILLS_HOUSE,                    4,  4 ; $58
+	mapconst VERMILION_POKECENTER,           4,  7 ; $59
+	mapconst POKEMON_FAN_CLUB,               4,  4 ; $5A
+	mapconst VERMILION_MART,                 4,  4 ; $5B
+	mapconst VERMILION_GYM,                  9,  5 ; $5C
+	mapconst VERMILION_PIDGEY_HOUSE,         4,  4 ; $5D
+	mapconst VERMILION_DOCK,                 6, 14 ; $5E
+	mapconst SS_ANNE_1F,                     9, 20 ; $5F
+	mapconst SS_ANNE_2F,                     9, 20 ; $60
+	mapconst SS_ANNE_3F,                     3, 10 ; $61
+	mapconst SS_ANNE_B1F,                    4, 15 ; $62
+	mapconst SS_ANNE_BOW,                    7, 10 ; $63
+	mapconst SS_ANNE_KITCHEN,                8,  7 ; $64
+	mapconst SS_ANNE_CAPTAINS_ROOM,          4,  3 ; $65
+	mapconst SS_ANNE_1F_ROOMS,               8, 12 ; $66
+	mapconst SS_ANNE_2F_ROOMS,               8, 12 ; $67
+	mapconst SS_ANNE_B1F_ROOMS,              8, 12 ; $68
+	mapconst UNUSED_MAP_69,                  0,  0 ; $69
+	mapconst UNUSED_MAP_6A,                  0,  0 ; $6A
+	mapconst UNUSED_MAP_6B,                  0,  0 ; $6B
+	mapconst VICTORY_ROAD_1F,                9, 10 ; $6C
+	mapconst UNUSED_MAP_6D,                  0,  0 ; $6D
+	mapconst UNUSED_MAP_6E,                  0,  0 ; $6E
+	mapconst UNUSED_MAP_6F,                  0,  0 ; $6F
+	mapconst UNUSED_MAP_70,                  0,  0 ; $70
+	mapconst LANCES_ROOM,                   13, 13 ; $71
+	mapconst UNUSED_MAP_72,                  0,  0 ; $72
+	mapconst UNUSED_MAP_73,                  0,  0 ; $73
+	mapconst UNUSED_MAP_74,                  0,  0 ; $74
+	mapconst UNUSED_MAP_75,                  0,  0 ; $75
+	mapconst HALL_OF_FAME,                   4,  5 ; $76
+	mapconst UNDERGROUND_PATH_NORTH_SOUTH,  24,  4 ; $77
+	mapconst CHAMPIONS_ROOM,                 4,  4 ; $78
+	mapconst UNDERGROUND_PATH_WEST_EAST,     4, 25 ; $79
+	mapconst CELADON_MART_1F,                4, 10 ; $7A
+	mapconst CELADON_MART_2F,                4, 10 ; $7B
+	mapconst CELADON_MART_3F,                4, 10 ; $7C
+	mapconst CELADON_MART_4F,                4, 10 ; $7D
+	mapconst CELADON_MART_ROOF,              4, 10 ; $7E
+	mapconst CELADON_MART_ELEVATOR,          2,  2 ; $7F
+	mapconst CELADON_MANSION_1F,             6,  4 ; $80
+	mapconst CELADON_MANSION_2F,             6,  4 ; $81
+	mapconst CELADON_MANSION_3F,             6,  4 ; $82
+	mapconst CELADON_MANSION_ROOF,           6,  4 ; $83
+	mapconst CELADON_MANSION_ROOF_HOUSE,     4,  4 ; $84
+	mapconst CELADON_POKECENTER,             4,  7 ; $85
+	mapconst CELADON_GYM,                    9,  5 ; $86
+	mapconst GAME_CORNER,                    9, 10 ; $87
+	mapconst CELADON_MART_5F,                4, 10 ; $88
+	mapconst GAME_CORNER_PRIZE_ROOM,         4,  5 ; $89
+	mapconst CELADON_DINER,                  4,  5 ; $8A
+	mapconst CELADON_CHIEF_HOUSE,            4,  4 ; $8B
+	mapconst CELADON_HOTEL,                  4,  7 ; $8C
+	mapconst LAVENDER_POKECENTER,            4,  7 ; $8D
+	mapconst POKEMON_TOWER_1F,               9, 10 ; $8E
+	mapconst POKEMON_TOWER_2F,               9, 10 ; $8F
+	mapconst POKEMON_TOWER_3F,               9, 10 ; $90
+	mapconst POKEMON_TOWER_4F,               9, 10 ; $91
+	mapconst POKEMON_TOWER_5F,               9, 10 ; $92
+	mapconst POKEMON_TOWER_6F,               9, 10 ; $93
+	mapconst POKEMON_TOWER_7F,               9, 10 ; $94
+	mapconst MR_FUJIS_HOUSE,                 4,  4 ; $95
+	mapconst LAVENDER_MART,                  4,  4 ; $96
+	mapconst LAVENDER_CUBONE_HOUSE,          4,  4 ; $97
+	mapconst FUCHSIA_MART,                   4,  4 ; $98
+	mapconst FUCHSIA_BILLS_GRANDPAS_HOUSE,   4,  4 ; $99
+	mapconst FUCHSIA_POKECENTER,             4,  7 ; $9A
+	mapconst WARDENS_HOUSE,                  4,  5 ; $9B
+	mapconst SAFARI_ZONE_GATE,               3,  4 ; $9C
+	mapconst FUCHSIA_GYM,                    9,  5 ; $9D
+	mapconst FUCHSIA_MEETING_ROOM,           4,  7 ; $9E
+	mapconst SEAFOAM_ISLANDS_B1F,            9, 15 ; $9F
+	mapconst SEAFOAM_ISLANDS_B2F,            9, 15 ; $A0
+	mapconst SEAFOAM_ISLANDS_B3F,            9, 15 ; $A1
+	mapconst SEAFOAM_ISLANDS_B4F,            9, 15 ; $A2
+	mapconst VERMILION_OLD_ROD_HOUSE,        4,  4 ; $A3
+	mapconst FUCHSIA_GOOD_ROD_HOUSE,         4,  4 ; $A4
+	mapconst POKEMON_MANSION_1F,            14, 15 ; $A5
+	mapconst CINNABAR_GYM,                   9, 10 ; $A6
+	mapconst CINNABAR_LAB,                   4,  9 ; $A7
+	mapconst CINNABAR_LAB_TRADE_ROOM,        4,  4 ; $A8
+	mapconst CINNABAR_LAB_METRONOME_ROOM,    4,  4 ; $A9
+	mapconst CINNABAR_LAB_FOSSIL_ROOM,       4,  4 ; $AA
+	mapconst CINNABAR_POKECENTER,            4,  7 ; $AB
+	mapconst CINNABAR_MART,                  4,  4 ; $AC
+	mapconst CINNABAR_MART_COPY,             4,  4 ; $AD
+	mapconst INDIGO_PLATEAU_LOBBY,           6,  8 ; $AE
+	mapconst COPYCATS_HOUSE_1F,              4,  4 ; $AF
+	mapconst COPYCATS_HOUSE_2F,              4,  4 ; $B0
+	mapconst FIGHTING_DOJO,                  6,  5 ; $B1
+	mapconst SAFFRON_GYM,                    9, 10 ; $B2
+	mapconst SAFFRON_PIDGEY_HOUSE,           4,  4 ; $B3
+	mapconst SAFFRON_MART,                   4,  4 ; $B4
+	mapconst SILPH_CO_1F,                    9, 15 ; $B5
+	mapconst SAFFRON_POKECENTER,             4,  7 ; $B6
+	mapconst MR_PSYCHICS_HOUSE,              4,  4 ; $B7
+	mapconst ROUTE_15_GATE_1F,               5,  4 ; $B8
+	mapconst ROUTE_15_GATE_2F,               4,  4 ; $B9
+	mapconst ROUTE_16_GATE_1F,               7,  4 ; $BA
+	mapconst ROUTE_16_GATE_2F,               4,  4 ; $BB
+	mapconst ROUTE_16_FLY_HOUSE,             4,  4 ; $BC
+	mapconst ROUTE_12_SUPER_ROD_HOUSE,       4,  4 ; $BD
+	mapconst ROUTE_18_GATE_1F,               5,  4 ; $BE
+	mapconst ROUTE_18_GATE_2F,               4,  4 ; $BF
+	mapconst SEAFOAM_ISLANDS_1F,             9, 15 ; $C0
+	mapconst ROUTE_22_GATE,                  4,  5 ; $C1
+	mapconst VICTORY_ROAD_2F,                9, 15 ; $C2
+	mapconst ROUTE_12_GATE_2F,               4,  4 ; $C3
+	mapconst VERMILION_TRADE_HOUSE,          4,  4 ; $C4
+	mapconst DIGLETTS_CAVE,                 18, 20 ; $C5
+	mapconst VICTORY_ROAD_3F,                9, 15 ; $C6
+	mapconst ROCKET_HIDEOUT_B1F,            14, 15 ; $C7
+	mapconst ROCKET_HIDEOUT_B2F,            14, 15 ; $C8
+	mapconst ROCKET_HIDEOUT_B3F,            14, 15 ; $C9
+	mapconst ROCKET_HIDEOUT_B4F,            12, 15 ; $CA
+	mapconst ROCKET_HIDEOUT_ELEVATOR,        4,  3 ; $CB
+	mapconst UNUSED_MAP_CC,                  0,  0 ; $CC
+	mapconst UNUSED_MAP_CD,                  0,  0 ; $CD
+	mapconst UNUSED_MAP_CE,                  0,  0 ; $CE
+	mapconst SILPH_CO_2F,                    9, 15 ; $CF
+	mapconst SILPH_CO_3F,                    9, 15 ; $D0
+	mapconst SILPH_CO_4F,                    9, 15 ; $D1
+	mapconst SILPH_CO_5F,                    9, 15 ; $D2
+	mapconst SILPH_CO_6F,                    9, 13 ; $D3
+	mapconst SILPH_CO_7F,                    9, 13 ; $D4
+	mapconst SILPH_CO_8F,                    9, 13 ; $D5
+	mapconst POKEMON_MANSION_2F,            14, 15 ; $D6
+	mapconst POKEMON_MANSION_3F,             9, 15 ; $D7
+	mapconst POKEMON_MANSION_B1F,           14, 15 ; $D8
+	mapconst SAFARI_ZONE_EAST,              13, 15 ; $D9
+	mapconst SAFARI_ZONE_NORTH,             18, 20 ; $DA
+	mapconst SAFARI_ZONE_WEST,              13, 15 ; $DB
+	mapconst SAFARI_ZONE_CENTER,            13, 15 ; $DC
+	mapconst SAFARI_ZONE_CENTER_REST_HOUSE,  4,  4 ; $DD
+	mapconst SAFARI_ZONE_SECRET_HOUSE,       4,  4 ; $DE
+	mapconst SAFARI_ZONE_WEST_REST_HOUSE,    4,  4 ; $DF
+	mapconst SAFARI_ZONE_EAST_REST_HOUSE,    4,  4 ; $E0
+	mapconst SAFARI_ZONE_NORTH_REST_HOUSE,   4,  4 ; $E1
+	mapconst CERULEAN_CAVE_2F,               9, 15 ; $E2
+	mapconst CERULEAN_CAVE_B1F,              9, 15 ; $E3
+	mapconst CERULEAN_CAVE_1F,               9, 15 ; $E4
+	mapconst NAME_RATERS_HOUSE,              4,  4 ; $E5
+	mapconst CERULEAN_BADGE_HOUSE,           4,  4 ; $E6
+	mapconst UNUSED_MAP_E7,                  0,  0 ; $E7
+	mapconst ROCK_TUNNEL_B1F,               18, 20 ; $E8
+	mapconst SILPH_CO_9F,                    9, 13 ; $E9
+	mapconst SILPH_CO_10F,                   9,  8 ; $EA
+	mapconst SILPH_CO_11F,                   9,  9 ; $EB
+	mapconst SILPH_CO_ELEVATOR,              2,  2 ; $EC
+	mapconst UNUSED_MAP_ED,                  0,  0 ; $ED
+	mapconst UNUSED_MAP_EE,                  0,  0 ; $EE
+	mapconst TRADE_CENTER,                   4,  5 ; $EF
+	mapconst COLOSSEUM,                      4,  5 ; $F0
+	mapconst UNUSED_MAP_F1,                  0,  0 ; $F1
+	mapconst UNUSED_MAP_F2,                  0,  0 ; $F2
+	mapconst UNUSED_MAP_F3,                  0,  0 ; $F3
+	mapconst UNUSED_MAP_F4,                  0,  0 ; $F4
+	mapconst LORELEIS_ROOM,                  6,  5 ; $F5
+	mapconst BRUNOS_ROOM,                    6,  5 ; $F6
+	mapconst AGATHAS_ROOM,                   6,  5 ; $F7
diff --git a/data/force_bike_surf.asm b/data/force_bike_surf.asm
index 926db476..fb352aa9 100755
--- a/data/force_bike_surf.asm
+++ b/data/force_bike_surf.asm
@@ -4,8 +4,8 @@ ForcedBikeOrSurfMaps:
 	db ROUTE_16,$0B,$11
 	db ROUTE_18,$08,$21
 	db ROUTE_18,$09,$21
-	db SEAFOAM_ISLANDS_4,$07,$12
-	db SEAFOAM_ISLANDS_4,$07,$13
-	db SEAFOAM_ISLANDS_5,$0E,$04
-	db SEAFOAM_ISLANDS_5,$0E,$05
+	db SEAFOAM_ISLANDS_B3F,$07,$12
+	db SEAFOAM_ISLANDS_B3F,$07,$13
+	db SEAFOAM_ISLANDS_B4F,$0E,$04
+	db SEAFOAM_ISLANDS_B4F,$0E,$05
 	db $FF ;end
diff --git a/data/hidden_item_coords.asm b/data/hidden_item_coords.asm
index 96c4a07b..6b911dea 100755
--- a/data/hidden_item_coords.asm
+++ b/data/hidden_item_coords.asm
@@ -2,38 +2,38 @@ HiddenItemCoords:
 ; map ID, then coords
 	db VIRIDIAN_FOREST,$12,$01
 	db VIRIDIAN_FOREST,$2a,$10
-	db MT_MOON_3,$0c,$12
+	db MT_MOON_B2F,$0c,$12
 	db ROUTE_25,$03,$26
 	db ROUTE_9,$07,$0e
-	db SS_ANNE_6,$09,$0d
-	db SS_ANNE_10,$01,$03
+	db SS_ANNE_KITCHEN,$09,$0d
+	db SS_ANNE_B1F_ROOMS,$01,$03
 	db ROUTE_10,$11,$09
 	db ROUTE_10,$35,$10
-	db ROCKET_HIDEOUT_1,$0f,$15
-	db ROCKET_HIDEOUT_3,$11,$1b
-	db ROCKET_HIDEOUT_4,$01,$19
-	db POKEMONTOWER_5,$0c,$04
+	db ROCKET_HIDEOUT_B1F,$0f,$15
+	db ROCKET_HIDEOUT_B3F,$11,$1b
+	db ROCKET_HIDEOUT_B4F,$01,$19
+	db POKEMON_TOWER_5F,$0c,$04
 	db ROUTE_13,$0e,$01
 	db ROUTE_13,$0d,$10
-	db MANSION_4,$09,$01
-	db SAFARI_ZONE_ENTRANCE,$01,$0a
+	db POKEMON_MANSION_B1F,$09,$01
+	db SAFARI_ZONE_GATE,$01,$0a
 	db SAFARI_ZONE_WEST,$05,$06
 	db SILPH_CO_5F,$03,$0c
 	db SILPH_CO_9F,$0f,$02
 	db COPYCATS_HOUSE_2F,$01,$01
-	db UNKNOWN_DUNGEON_1,$0b,$0e
-	db UNKNOWN_DUNGEON_3,$03,$1b
+	db CERULEAN_CAVE_1F,$0b,$0e
+	db CERULEAN_CAVE_B1F,$03,$1b
 	db POWER_PLANT,$10,$11
 	db POWER_PLANT,$01,$0c
-	db SEAFOAM_ISLANDS_3,$0f,$0f
-	db SEAFOAM_ISLANDS_5,$11,$19
-	db MANSION_1,$10,$08
-	db MANSION_3,$09,$01
+	db SEAFOAM_ISLANDS_B2F,$0f,$0f
+	db SEAFOAM_ISLANDS_B4F,$11,$19
+	db POKEMON_MANSION_1F,$10,$08
+	db POKEMON_MANSION_3F,$09,$01
 	db ROUTE_23,$2c,$09
 	db ROUTE_23,$46,$13
 	db ROUTE_23,$5a,$08
-	db VICTORY_ROAD_2,$02,$05
-	db VICTORY_ROAD_2,$07,$1a
+	db VICTORY_ROAD_2F,$02,$05
+	db VICTORY_ROAD_2F,$07,$1a
 	db UNUSED_MAP_6F,$0b,$0e
 	db VIRIDIAN_CITY,$04,$0e
 	db ROUTE_11,$05,$30
@@ -43,14 +43,14 @@ HiddenItemCoords:
 	db ROUTE_17,$48,$11
 	db ROUTE_17,$5b,$04
 	db ROUTE_17,$79,$08
-	db UNDERGROUND_PATH_NS,$04,$03
-	db UNDERGROUND_PATH_NS,$22,$04
-	db UNDERGROUND_PATH_WE,$02,$0c
-	db UNDERGROUND_PATH_WE,$05,$15
+	db UNDERGROUND_PATH_NORTH_SOUTH,$04,$03
+	db UNDERGROUND_PATH_NORTH_SOUTH,$22,$04
+	db UNDERGROUND_PATH_WEST_EAST,$02,$0c
+	db UNDERGROUND_PATH_WEST_EAST,$05,$15
 	db CELADON_CITY,$0f,$30
 	db ROUTE_25,$01,$0a
-	db MT_MOON_3,$09,$21
-	db SEAFOAM_ISLANDS_4,$10,$09
+	db MT_MOON_B2F,$09,$21
+	db SEAFOAM_ISLANDS_B3F,$10,$09
 	db VERMILION_CITY,$0b,$0e
 	db CERULEAN_CITY,$08,$0f
 	db ROUTE_4,$03,$28
diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm
index 43627bfc..b1bfd844 100755
--- a/data/hidden_objects.asm
+++ b/data/hidden_objects.asm
@@ -4,7 +4,7 @@ HiddenObjectMaps:
 	db OAKS_LAB
 	db VIRIDIAN_POKECENTER
 	db VIRIDIAN_MART
-	db VIRIDIAN_SCHOOL
+	db VIRIDIAN_SCHOOL_HOUSE
 	db VIRIDIAN_GYM
 	db MUSEUM_1F
 	db PEWTER_GYM
@@ -16,7 +16,7 @@ HiddenObjectMaps:
 	db LAVENDER_POKECENTER
 	db VERMILION_POKECENTER
 	db VERMILION_GYM
-	db CELADON_MANSION_2
+	db CELADON_MANSION_2F
 	db CELADON_POKECENTER
 	db CELADON_GYM
 	db GAME_CORNER
@@ -31,56 +31,56 @@ HiddenObjectMaps:
 	db TRADE_CENTER
 	db COLOSSEUM
 	db VIRIDIAN_FOREST
-	db MT_MOON_3
+	db MT_MOON_B2F
 	db INDIGO_PLATEAU
 	db ROUTE_25
 	db ROUTE_9
-	db SS_ANNE_6
-	db SS_ANNE_10
-	db ROCKET_HIDEOUT_1
-	db ROCKET_HIDEOUT_3
-	db ROCKET_HIDEOUT_4
+	db SS_ANNE_KITCHEN
+	db SS_ANNE_B1F_ROOMS
+	db ROCKET_HIDEOUT_B1F
+	db ROCKET_HIDEOUT_B3F
+	db ROCKET_HIDEOUT_B4F
 	db SAFFRON_POKECENTER
-	db POKEMONTOWER_5
+	db POKEMON_TOWER_5F
 	db ROUTE_13
-	db SAFARI_ZONE_ENTRANCE
+	db SAFARI_ZONE_GATE
 	db SAFARI_ZONE_WEST
 	db SILPH_CO_5F
 	db SILPH_CO_9F
 	db COPYCATS_HOUSE_2F
-	db UNKNOWN_DUNGEON_1
-	db UNKNOWN_DUNGEON_3
+	db CERULEAN_CAVE_1F
+	db CERULEAN_CAVE_B1F
 	db POWER_PLANT
-	db SEAFOAM_ISLANDS_3
-	db SEAFOAM_ISLANDS_5
-	db MANSION_1
-	db MANSION_3
+	db SEAFOAM_ISLANDS_B2F
+	db SEAFOAM_ISLANDS_B4F
+	db POKEMON_MANSION_1F
+	db POKEMON_MANSION_3F
 	db ROUTE_23
-	db VICTORY_ROAD_2
-	db $6F
+	db VICTORY_ROAD_2F
+	db UNUSED_MAP_6F
 	db BILLS_HOUSE
 	db VIRIDIAN_CITY
-	db SAFARI_ZONE_REST_HOUSE_2
-	db SAFARI_ZONE_REST_HOUSE_3
-	db SAFARI_ZONE_REST_HOUSE_4
+	db SAFARI_ZONE_WEST_REST_HOUSE
+	db SAFARI_ZONE_EAST_REST_HOUSE
+	db SAFARI_ZONE_NORTH_REST_HOUSE
 	db ROUTE_15_GATE_2F
-	db LAVENDER_HOUSE_1
-	db CELADON_MANSION_5
+	db MR_FUJIS_HOUSE
+	db CELADON_MANSION_ROOF_HOUSE
 	db FIGHTING_DOJO
 	db ROUTE_10
 	db INDIGO_PLATEAU_LOBBY
-	db CINNABAR_LAB_4
+	db CINNABAR_LAB_FOSSIL_ROOM
 	db BIKE_SHOP
 	db ROUTE_11
 	db ROUTE_12
-	db MANSION_2
-	db MANSION_4
+	db POKEMON_MANSION_2F
+	db POKEMON_MANSION_B1F
 	db SILPH_CO_11F
 	db ROUTE_17
-	db UNDERGROUND_PATH_NS
-	db UNDERGROUND_PATH_WE
+	db UNDERGROUND_PATH_NORTH_SOUTH
+	db UNDERGROUND_PATH_WEST_EAST
 	db CELADON_CITY
-	db SEAFOAM_ISLANDS_4
+	db SEAFOAM_ISLANDS_B3F
 	db VERMILION_CITY
 	db CERULEAN_CITY
 	db ROUTE_4
diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm
index 1fa4b64a..7f4593ca 100755
--- a/data/hide_show_data.asm
+++ b/data/hide_show_data.asm
@@ -343,38 +343,38 @@ MapHS2D:
 MapHS34:
 	db MUSEUM_1F,$05,Show
 MapHSE4:
-	db UNKNOWN_DUNGEON_1,$01,Show
-	db UNKNOWN_DUNGEON_1,$02,Show
-	db UNKNOWN_DUNGEON_1,$03,Show
+	db CERULEAN_CAVE_1F,$01,Show
+	db CERULEAN_CAVE_1F,$02,Show
+	db CERULEAN_CAVE_1F,$03,Show
 MapHS8F:
-	db POKEMONTOWER_2,$01,Show
+	db POKEMON_TOWER_2F,$01,Show
 MapHS90:
-	db POKEMONTOWER_3,$04,Show
+	db POKEMON_TOWER_3F,$04,Show
 MapHS91:
-	db POKEMONTOWER_4,$04,Show
-	db POKEMONTOWER_4,$05,Show
-	db POKEMONTOWER_4,$06,Show
+	db POKEMON_TOWER_4F,$04,Show
+	db POKEMON_TOWER_4F,$05,Show
+	db POKEMON_TOWER_4F,$06,Show
 MapHS92:
-	db POKEMONTOWER_5,$06,Show
+	db POKEMON_TOWER_5F,$06,Show
 MapHS93:
-	db POKEMONTOWER_6,$04,Show
-	db POKEMONTOWER_6,$05,Show
+	db POKEMON_TOWER_6F,$04,Show
+	db POKEMON_TOWER_6F,$05,Show
 MapHS94:
-	db POKEMONTOWER_7,$01,Show
-	db POKEMONTOWER_7,$02,Show
-	db POKEMONTOWER_7,$03,Show
-	db POKEMONTOWER_7,$04,Show
+	db POKEMON_TOWER_7F,$01,Show
+	db POKEMON_TOWER_7F,$02,Show
+	db POKEMON_TOWER_7F,$03,Show
+	db POKEMON_TOWER_7F,$04,Show
 MapHS95:
-	db LAVENDER_HOUSE_1,$05,Hide
+	db MR_FUJIS_HOUSE,$05,Hide
 MapHS84:
-	db CELADON_MANSION_5,$02,Show
+	db CELADON_MANSION_ROOF_HOUSE,$02,Show
 MapHS87:
 	db GAME_CORNER,$0B,Show
 MapHS9B:
-	db FUCHSIA_HOUSE_2,$02,Show
+	db WARDENS_HOUSE,$02,Show
 MapHSA5:
-	db MANSION_1,$02,Show
-	db MANSION_1,$03,Show
+	db POKEMON_MANSION_1F,$02,Show
+	db POKEMON_MANSION_1F,$03,Show
 MapHSB1:
 	db FIGHTING_DOJO,$06,Show
 	db FIGHTING_DOJO,$07,Show
@@ -396,12 +396,12 @@ MapHS53:
 	db POWER_PLANT,$0D,Show
 	db POWER_PLANT,$0E,Show
 MapHSC2:
-	db VICTORY_ROAD_2,$06,Show
-	db VICTORY_ROAD_2,$07,Show
-	db VICTORY_ROAD_2,$08,Show
-	db VICTORY_ROAD_2,$09,Show
-	db VICTORY_ROAD_2,$0A,Show
-	db VICTORY_ROAD_2,$0D,Show
+	db VICTORY_ROAD_2F,$06,Show
+	db VICTORY_ROAD_2F,$07,Show
+	db VICTORY_ROAD_2F,$08,Show
+	db VICTORY_ROAD_2F,$09,Show
+	db VICTORY_ROAD_2F,$0A,Show
+	db VICTORY_ROAD_2F,$0D,Show
 MapHS58:
 	db BILLS_HOUSE,$01,Show
 	db BILLS_HOUSE,$02,Hide
@@ -411,50 +411,50 @@ MapHS33:
 	db VIRIDIAN_FOREST,$06,Show
 	db VIRIDIAN_FOREST,$07,Show
 MapHS3B:
-	db MT_MOON_1,$08,Show
-	db MT_MOON_1,$09,Show
-	db MT_MOON_1,$0A,Show
-	db MT_MOON_1,$0B,Show
-	db MT_MOON_1,$0C,Show
-	db MT_MOON_1,$0D,Show
+	db MT_MOON_1F,$08,Show
+	db MT_MOON_1F,$09,Show
+	db MT_MOON_1F,$0A,Show
+	db MT_MOON_1F,$0B,Show
+	db MT_MOON_1F,$0C,Show
+	db MT_MOON_1F,$0D,Show
 MapHS3D:
-	db MT_MOON_3,$06,Show
-	db MT_MOON_3,$07,Show
-	db MT_MOON_3,$08,Show
-	db MT_MOON_3,$09,Show
+	db MT_MOON_B2F,$06,Show
+	db MT_MOON_B2F,$07,Show
+	db MT_MOON_B2F,$08,Show
+	db MT_MOON_B2F,$09,Show
 MapHS60:
-	db SS_ANNE_2,$02,Hide
+	db SS_ANNE_2F,$02,Hide
 MapHS66:
-	db SS_ANNE_8,$0A,Show
+	db SS_ANNE_1F_ROOMS,$0A,Show
 MapHS67:
-	db SS_ANNE_9,$06,Show
-	db SS_ANNE_9,$09,Show
+	db SS_ANNE_2F_ROOMS,$06,Show
+	db SS_ANNE_2F_ROOMS,$09,Show
 MapHS68:
-	db SS_ANNE_10,$09,Show
-	db SS_ANNE_10,$0A,Show
-	db SS_ANNE_10,$0B,Show
+	db SS_ANNE_B1F_ROOMS,$09,Show
+	db SS_ANNE_B1F_ROOMS,$0A,Show
+	db SS_ANNE_B1F_ROOMS,$0B,Show
 MapHSC6:
-	db VICTORY_ROAD_3,$05,Show
-	db VICTORY_ROAD_3,$06,Show
-	db VICTORY_ROAD_3,$0A,Show
+	db VICTORY_ROAD_3F,$05,Show
+	db VICTORY_ROAD_3F,$06,Show
+	db VICTORY_ROAD_3F,$0A,Show
 MapHSC7:
-	db ROCKET_HIDEOUT_1,$06,Show
-	db ROCKET_HIDEOUT_1,$07,Show
+	db ROCKET_HIDEOUT_B1F,$06,Show
+	db ROCKET_HIDEOUT_B1F,$07,Show
 MapHSC8:
-	db ROCKET_HIDEOUT_2,$02,Show
-	db ROCKET_HIDEOUT_2,$03,Show
-	db ROCKET_HIDEOUT_2,$04,Show
-	db ROCKET_HIDEOUT_2,$05,Show
+	db ROCKET_HIDEOUT_B2F,$02,Show
+	db ROCKET_HIDEOUT_B2F,$03,Show
+	db ROCKET_HIDEOUT_B2F,$04,Show
+	db ROCKET_HIDEOUT_B2F,$05,Show
 MapHSC9:
-	db ROCKET_HIDEOUT_3,$03,Show
-	db ROCKET_HIDEOUT_3,$04,Show
+	db ROCKET_HIDEOUT_B3F,$03,Show
+	db ROCKET_HIDEOUT_B3F,$04,Show
 MapHSCA:
-	db ROCKET_HIDEOUT_4,$01,Show
-	db ROCKET_HIDEOUT_4,$05,Show
-	db ROCKET_HIDEOUT_4,$06,Show
-	db ROCKET_HIDEOUT_4,$07,Show
-	db ROCKET_HIDEOUT_4,$08,Hide
-	db ROCKET_HIDEOUT_4,$09,Hide
+	db ROCKET_HIDEOUT_B4F,$01,Show
+	db ROCKET_HIDEOUT_B4F,$05,Show
+	db ROCKET_HIDEOUT_B4F,$06,Show
+	db ROCKET_HIDEOUT_B4F,$07,Show
+	db ROCKET_HIDEOUT_B4F,$08,Hide
+	db ROCKET_HIDEOUT_B4F,$09,Hide
 MapHSCF:
 	db SILPH_CO_2F,$01,Show
 	db SILPH_CO_2F,$02,Show
@@ -515,18 +515,18 @@ MapHSEB:
 	db SILPH_CO_11F,$04,Show
 	db SILPH_CO_11F,$05,Show
 MapHSF4:
-	db $F4,$02,Show
+	db UNUSED_MAP_F4,$02,Show
 MapHSD6:
-	db MANSION_2,$02,Show
+	db POKEMON_MANSION_2F,$02,Show
 MapHSD7:
-	db MANSION_3,$03,Show
-	db MANSION_3,$04,Show
+	db POKEMON_MANSION_3F,$03,Show
+	db POKEMON_MANSION_3F,$04,Show
 MapHSD8:
-	db MANSION_4,$03,Show
-	db MANSION_4,$04,Show
-	db MANSION_4,$05,Show
-	db MANSION_4,$06,Show
-	db MANSION_4,$08,Show
+	db POKEMON_MANSION_B1F,$03,Show
+	db POKEMON_MANSION_B1F,$04,Show
+	db POKEMON_MANSION_B1F,$05,Show
+	db POKEMON_MANSION_B1F,$06,Show
+	db POKEMON_MANSION_B1F,$08,Show
 MapHSD9:
 	db SAFARI_ZONE_EAST,$01,Show
 	db SAFARI_ZONE_EAST,$02,Show
@@ -543,35 +543,35 @@ MapHSDB:
 MapHSDC:
 	db SAFARI_ZONE_CENTER,$01,Show
 MapHSE2:
-	db UNKNOWN_DUNGEON_2,$01,Show
-	db UNKNOWN_DUNGEON_2,$02,Show
-	db UNKNOWN_DUNGEON_2,$03,Show
+	db CERULEAN_CAVE_2F,$01,Show
+	db CERULEAN_CAVE_2F,$02,Show
+	db CERULEAN_CAVE_2F,$03,Show
 MapHSE3:
-	db UNKNOWN_DUNGEON_3,$01,Show
-	db UNKNOWN_DUNGEON_3,$02,Show
-	db UNKNOWN_DUNGEON_3,$03,Show
+	db CERULEAN_CAVE_B1F,$01,Show
+	db CERULEAN_CAVE_B1F,$02,Show
+	db CERULEAN_CAVE_B1F,$03,Show
 MapHS6C:
-	db VICTORY_ROAD_1,$03,Show
-	db VICTORY_ROAD_1,$04,Show
+	db VICTORY_ROAD_1F,$03,Show
+	db VICTORY_ROAD_1F,$04,Show
 MapHS78:
 	db CHAMPIONS_ROOM,$02,Hide
 MapHSC0:
-	db SEAFOAM_ISLANDS_1,$01,Show
-	db SEAFOAM_ISLANDS_1,$02,Show
+	db SEAFOAM_ISLANDS_1F,$01,Show
+	db SEAFOAM_ISLANDS_1F,$02,Show
 MapHS9F:
-	db SEAFOAM_ISLANDS_2,$01,Hide
-	db SEAFOAM_ISLANDS_2,$02,Hide
+	db SEAFOAM_ISLANDS_B1F,$01,Hide
+	db SEAFOAM_ISLANDS_B1F,$02,Hide
 MapHSA0:
-	db SEAFOAM_ISLANDS_3,$01,Hide
-	db SEAFOAM_ISLANDS_3,$02,Hide
+	db SEAFOAM_ISLANDS_B2F,$01,Hide
+	db SEAFOAM_ISLANDS_B2F,$02,Hide
 MapHSA1:
-	db SEAFOAM_ISLANDS_4,$02,Show
-	db SEAFOAM_ISLANDS_4,$03,Show
-	db SEAFOAM_ISLANDS_4,$05,Hide
-	db SEAFOAM_ISLANDS_4,$06,Hide
+	db SEAFOAM_ISLANDS_B3F,$02,Show
+	db SEAFOAM_ISLANDS_B3F,$03,Show
+	db SEAFOAM_ISLANDS_B3F,$05,Hide
+	db SEAFOAM_ISLANDS_B3F,$06,Hide
 MapHSA2:
-	db SEAFOAM_ISLANDS_5,$01,Hide
-	db SEAFOAM_ISLANDS_5,$02,Hide
-	db SEAFOAM_ISLANDS_5,$03,Show
+	db SEAFOAM_ISLANDS_B4F,$01,Hide
+	db SEAFOAM_ISLANDS_B4F,$02,Hide
+	db SEAFOAM_ISLANDS_B4F,$03,Show
 
 	db $FF,$01,Show
diff --git a/data/mapHeaders/AgathasRoom.asm b/data/mapHeaders/AgathasRoom.asm
new file mode 100755
index 00000000..73cd7291
--- /dev/null
+++ b/data/mapHeaders/AgathasRoom.asm
@@ -0,0 +1,8 @@
+AgathasRoom_h:
+	db CEMETERY ; tileset
+	db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x)
+	dw AgathasRoom_Blocks ; blocks
+	dw AgathasRoom_TextPointers ; texts
+	dw AgathasRoom_Script ; scripts
+	db 0 ; connections
+	dw AgathasRoom_Object ; objects
diff --git a/data/mapHeaders/BikeShop.asm b/data/mapHeaders/BikeShop.asm
new file mode 100755
index 00000000..c447fd80
--- /dev/null
+++ b/data/mapHeaders/BikeShop.asm
@@ -0,0 +1,8 @@
+BikeShop_h:
+	db CLUB ; tileset
+	db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x)
+	dw BikeShop_Blocks ; blocks
+	dw BikeShop_TextPointers ; texts
+	dw BikeShop_Script ; scripts
+	db 0 ; connections
+	dw BikeShop_Object ; objects
diff --git a/data/mapHeaders/BillsHouse.asm b/data/mapHeaders/BillsHouse.asm
new file mode 100755
index 00000000..bba9cf83
--- /dev/null
+++ b/data/mapHeaders/BillsHouse.asm
@@ -0,0 +1,8 @@
+BillsHouse_h:
+	db INTERIOR ; tileset
+	db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x)
+	dw BillsHouse_Blocks ; blocks
+	dw BillsHouse_TextPointers ; texts
+	dw BillsHouse_Script ; scripts
+	db 0 ; connections
+	dw BillsHouse_Object ; objects
diff --git a/data/mapHeaders/BluesHouse.asm b/data/mapHeaders/BluesHouse.asm
new file mode 100755
index 00000000..6ef0433e
--- /dev/null
+++ b/data/mapHeaders/BluesHouse.asm
@@ -0,0 +1,8 @@
+BluesHouse_h:
+	db HOUSE ; tileset
+	db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions (y, x)
+	dw BluesHouse_Blocks ; blocks
+	dw BluesHouse_TextPointers ; texts
+	dw BluesHouse_Script ; scripts
+	db 0 ; connections
+	dw BluesHouse_Object ; objects
diff --git a/data/mapHeaders/BrunosRoom.asm b/data/mapHeaders/BrunosRoom.asm
new file mode 100755
index 00000000..78c7989d
--- /dev/null
+++ b/data/mapHeaders/BrunosRoom.asm
@@ -0,0 +1,8 @@
+BrunosRoom_h:
+	db GYM ; tileset
+	db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x)
+	dw BrunosRoom_Blocks ; blocks
+	dw BrunosRoom_TextPointers ; texts
+	dw BrunosRoom_Script ; scripts
+	db 0 ; connections
+	dw BrunosRoom_Object ; objects
diff --git a/data/mapHeaders/CeladonChiefHouse.asm b/data/mapHeaders/CeladonChiefHouse.asm
new file mode 100755
index 00000000..a31c8121
--- /dev/null
+++ b/data/mapHeaders/CeladonChiefHouse.asm
@@ -0,0 +1,8 @@
+CeladonChiefHouse_h:
+	db MANSION ; tileset
+	db CELADON_CHIEF_HOUSE_HEIGHT, CELADON_CHIEF_HOUSE_WIDTH ; dimensions (y, x)
+	dw CeladonChiefHouse_Blocks ; blocks
+	dw CeladonChiefHouse_TextPointers ; texts
+	dw CeladonChiefHouse_Script ; scripts
+	db 0 ; connections
+	dw CeladonChiefHouse_Object ; objects
diff --git a/data/mapHeaders/CeladonCity.asm b/data/mapHeaders/CeladonCity.asm
new file mode 100755
index 00000000..62243d27
--- /dev/null
+++ b/data/mapHeaders/CeladonCity.asm
@@ -0,0 +1,10 @@
+CeladonCity_h:
+	db OVERWORLD ; tileset
+	db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x)
+	dw CeladonCity_Blocks ; blocks
+	dw CeladonCity_TextPointers ; texts
+	dw CeladonCity_Script ; scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION CELADON_CITY, ROUTE_16, 4, 0, Route16_Blocks
+	EAST_MAP_CONNECTION CELADON_CITY, ROUTE_7, 4, 0, Route7_Blocks, 1
+	dw CeladonCity_Object ; objects
diff --git a/data/mapHeaders/CeladonDiner.asm b/data/mapHeaders/CeladonDiner.asm
new file mode 100755
index 00000000..d4220db7
--- /dev/null
+++ b/data/mapHeaders/CeladonDiner.asm
@@ -0,0 +1,8 @@
+CeladonDiner_h:
+	db LOBBY ; tileset
+	db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x)
+	dw CeladonDiner_Blocks ; blocks
+	dw CeladonDiner_TextPointers ; texts
+	dw CeladonDiner_Script ; scripts
+	db 0 ; connections
+	dw CeladonDiner_Object ; objects
diff --git a/data/mapHeaders/CeladonGym.asm b/data/mapHeaders/CeladonGym.asm
new file mode 100755
index 00000000..04a9427c
--- /dev/null
+++ b/data/mapHeaders/CeladonGym.asm
@@ -0,0 +1,8 @@
+CeladonGym_h:
+	db GYM ; tileset
+	db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x)
+	dw CeladonGym_Blocks ; blocks
+	dw CeladonGym_TextPointers ; texts
+	dw CeladonGym_Script ; scripts
+	db 0 ; connections
+	dw CeladonGym_Object ; objects
diff --git a/data/mapHeaders/CeladonHotel.asm b/data/mapHeaders/CeladonHotel.asm
new file mode 100755
index 00000000..e06c2fd3
--- /dev/null
+++ b/data/mapHeaders/CeladonHotel.asm
@@ -0,0 +1,8 @@
+CeladonHotel_h:
+	db POKECENTER ; tileset
+	db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x)
+	dw CeladonHotel_Blocks ; blocks
+	dw CeladonHotel_TextPointers ; texts
+	dw CeladonHotel_Script ; scripts
+	db 0 ; connections
+	dw CeladonHotel_Object ; objects
diff --git a/data/mapHeaders/CeladonMansion1F.asm b/data/mapHeaders/CeladonMansion1F.asm
new file mode 100755
index 00000000..d2d0ee99
--- /dev/null
+++ b/data/mapHeaders/CeladonMansion1F.asm
@@ -0,0 +1,8 @@
+CeladonMansion1F_h:
+	db MANSION ; tileset
+	db CELADON_MANSION_1F_HEIGHT, CELADON_MANSION_1F_WIDTH ; dimensions (y, x)
+	dw CeladonMansion1F_Blocks ; blocks
+	dw CeladonMansion1F_TextPointers ; texts
+	dw CeladonMansion1F_Script ; scripts
+	db 0 ; connections
+	dw CeladonMansion1F_Object ; objects
diff --git a/data/mapHeaders/CeladonMansion2F.asm b/data/mapHeaders/CeladonMansion2F.asm
new file mode 100755
index 00000000..eceac30e
--- /dev/null
+++ b/data/mapHeaders/CeladonMansion2F.asm
@@ -0,0 +1,8 @@
+CeladonMansion2F_h:
+	db MANSION ; tileset
+	db CELADON_MANSION_2F_HEIGHT, CELADON_MANSION_2F_WIDTH ; dimensions (y, x)
+	dw CeladonMansion2F_Blocks ; blocks
+	dw CeladonMansion2F_TextPointers ; texts
+	dw CeladonMansion2F_Script ; scripts
+	db 0 ; connections
+	dw CeladonMansion2F_Object ; objects
diff --git a/data/mapHeaders/CeladonMansion3F.asm b/data/mapHeaders/CeladonMansion3F.asm
new file mode 100755
index 00000000..b5a0a705
--- /dev/null
+++ b/data/mapHeaders/CeladonMansion3F.asm
@@ -0,0 +1,8 @@
+CeladonMansion3F_h:
+	db MANSION ; tileset
+	db CELADON_MANSION_3F_HEIGHT, CELADON_MANSION_3F_WIDTH ; dimensions (y, x)
+	dw CeladonMansion3F_Blocks ; blocks
+	dw CeladonMansion3F_TextPointers ; texts
+	dw CeladonMansion3F_Script ; scripts
+	db 0 ; connections
+	dw CeladonMansion3F_Object ; objects
diff --git a/data/mapHeaders/CeladonMansionRoof.asm b/data/mapHeaders/CeladonMansionRoof.asm
new file mode 100755
index 00000000..d7a050c8
--- /dev/null
+++ b/data/mapHeaders/CeladonMansionRoof.asm
@@ -0,0 +1,8 @@
+CeladonMansionRoof_h:
+	db MANSION ; tileset
+	db CELADON_MANSION_ROOF_HEIGHT, CELADON_MANSION_ROOF_WIDTH ; dimensions (y, x)
+	dw CeladonMansionRoof_Blocks ; blocks
+	dw CeladonMansionRoof_TextPointers ; texts
+	dw CeladonMansionRoof_Script ; scripts
+	db 0 ; connections
+	dw CeladonMansionRoof_Object ; objects
diff --git a/data/mapHeaders/CeladonMansionRoofHouse.asm b/data/mapHeaders/CeladonMansionRoofHouse.asm
new file mode 100755
index 00000000..7fcf49e1
--- /dev/null
+++ b/data/mapHeaders/CeladonMansionRoofHouse.asm
@@ -0,0 +1,8 @@
+CeladonMansionRoofHouse_h:
+	db HOUSE ; tileset
+	db CELADON_MANSION_ROOF_HOUSE_HEIGHT, CELADON_MANSION_ROOF_HOUSE_WIDTH ; dimensions (y, x)
+	dw CeladonMansionRoofHouse_Blocks ; blocks
+	dw CeladonMansionRoofHouse_TextPointers ; texts
+	dw CeladonMansionRoofHouse_Script ; scripts
+	db 0 ; connections
+	dw CeladonMansionRoofHouse_Object ; objects
diff --git a/data/mapHeaders/CeladonMart1F.asm b/data/mapHeaders/CeladonMart1F.asm
new file mode 100755
index 00000000..51e968fa
--- /dev/null
+++ b/data/mapHeaders/CeladonMart1F.asm
@@ -0,0 +1,8 @@
+CeladonMart1F_h:
+	db LOBBY ; tileset
+	db CELADON_MART_1F_HEIGHT, CELADON_MART_1F_WIDTH ; dimensions (y, x)
+	dw CeladonMart1F_Blocks ; blocks
+	dw CeladonMart1F_TextPointers ; texts
+	dw CeladonMart1F_Script ; scripts
+	db 0 ; connections
+	dw CeladonMart1F_Object ; objects
diff --git a/data/mapHeaders/CeladonMart2F.asm b/data/mapHeaders/CeladonMart2F.asm
new file mode 100755
index 00000000..77106405
--- /dev/null
+++ b/data/mapHeaders/CeladonMart2F.asm
@@ -0,0 +1,8 @@
+CeladonMart2F_h:
+	db LOBBY ; tileset
+	db CELADON_MART_2F_HEIGHT, CELADON_MART_2F_WIDTH ; dimensions (y, x)
+	dw CeladonMart2F_Blocks ; blocks
+	dw CeladonMart2F_TextPointers ; texts
+	dw CeladonMart2F_Script ; scripts
+	db 0 ; connections
+	dw CeladonMart2F_Object ; objects
diff --git a/data/mapHeaders/CeladonMart3F.asm b/data/mapHeaders/CeladonMart3F.asm
new file mode 100755
index 00000000..c460945c
--- /dev/null
+++ b/data/mapHeaders/CeladonMart3F.asm
@@ -0,0 +1,8 @@
+CeladonMart3F_h:
+	db LOBBY ; tileset
+	db CELADON_MART_3F_HEIGHT, CELADON_MART_3F_WIDTH ; dimensions (y, x)
+	dw CeladonMart3F_Blocks ; blocks
+	dw CeladonMart3F_TextPointers ; texts
+	dw CeladonMart3F_Script ; scripts
+	db 0 ; connections
+	dw CeladonMart3F_Object ; objects
diff --git a/data/mapHeaders/CeladonMart4F.asm b/data/mapHeaders/CeladonMart4F.asm
new file mode 100755
index 00000000..a742570b
--- /dev/null
+++ b/data/mapHeaders/CeladonMart4F.asm
@@ -0,0 +1,8 @@
+CeladonMart4F_h:
+	db LOBBY ; tileset
+	db CELADON_MART_4F_HEIGHT, CELADON_MART_4F_WIDTH ; dimensions (y, x)
+	dw CeladonMart4F_Blocks ; blocks
+	dw CeladonMart4F_TextPointers ; texts
+	dw CeladonMart4F_Script ; scripts
+	db 0 ; connections
+	dw CeladonMart4F_Object ; objects
diff --git a/data/mapHeaders/CeladonMart5F.asm b/data/mapHeaders/CeladonMart5F.asm
new file mode 100755
index 00000000..4b5223e0
--- /dev/null
+++ b/data/mapHeaders/CeladonMart5F.asm
@@ -0,0 +1,8 @@
+CeladonMart5F_h:
+	db LOBBY ; tileset
+	db CELADON_MART_5F_HEIGHT, CELADON_MART_5F_WIDTH ; dimensions (y, x)
+	dw CeladonMart5F_Blocks ; blocks
+	dw CeladonMart5F_TextPointers ; texts
+	dw CeladonMart5F_Script ; scripts
+	db 0 ; connections
+	dw CeladonMart5F_Object ; objects
diff --git a/data/mapHeaders/CeladonMartElevator.asm b/data/mapHeaders/CeladonMartElevator.asm
new file mode 100755
index 00000000..06e87608
--- /dev/null
+++ b/data/mapHeaders/CeladonMartElevator.asm
@@ -0,0 +1,8 @@
+CeladonMartElevator_h:
+	db LOBBY ; tileset
+	db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x)
+	dw CeladonMartElevator_Blocks ; blocks
+	dw CeladonMartElevator_TextPointers ; texts
+	dw CeladonMartElevator_Script ; scripts
+	db 0 ; connections
+	dw CeladonMartElevator_Object ; objects
diff --git a/data/mapHeaders/CeladonMartRoof.asm b/data/mapHeaders/CeladonMartRoof.asm
new file mode 100755
index 00000000..163e25ed
--- /dev/null
+++ b/data/mapHeaders/CeladonMartRoof.asm
@@ -0,0 +1,8 @@
+CeladonMartRoof_h:
+	db LOBBY ; tileset
+	db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x)
+	dw CeladonMartRoof_Blocks ; blocks
+	dw CeladonMartRoof_TextPointers ; texts
+	dw CeladonMartRoof_Script ; scripts
+	db 0 ; connections
+	dw CeladonMartRoof_Object ; objects
diff --git a/data/mapHeaders/CeladonPokecenter.asm b/data/mapHeaders/CeladonPokecenter.asm
new file mode 100755
index 00000000..b5d9bd73
--- /dev/null
+++ b/data/mapHeaders/CeladonPokecenter.asm
@@ -0,0 +1,8 @@
+CeladonPokecenter_h:
+	db POKECENTER ; tileset
+	db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x)
+	dw CeladonPokecenter_Blocks ; blocks
+	dw CeladonPokecenter_TextPointers ; texts
+	dw CeladonPokecenter_Script ; scripts
+	db 0 ; connections
+	dw CeladonPokecenter_Object ; objects
diff --git a/data/mapHeaders/CeruleanBadgeHouse.asm b/data/mapHeaders/CeruleanBadgeHouse.asm
new file mode 100755
index 00000000..a94f1912
--- /dev/null
+++ b/data/mapHeaders/CeruleanBadgeHouse.asm
@@ -0,0 +1,8 @@
+CeruleanBadgeHouse_h:
+	db SHIP ; tileset
+	db CERULEAN_BADGE_HOUSE_HEIGHT, CERULEAN_BADGE_HOUSE_WIDTH ; dimensions (y, x)
+	dw CeruleanBadgeHouse_Blocks ; blocks
+	dw CeruleanBadgeHouse_TextPointers ; texts
+	dw CeruleanBadgeHouse_Script ; scripts
+	db 0 ; connections
+	dw CeruleanBadgeHouse_Object ; objects
diff --git a/data/mapHeaders/CeruleanCave1F.asm b/data/mapHeaders/CeruleanCave1F.asm
new file mode 100755
index 00000000..932dfb48
--- /dev/null
+++ b/data/mapHeaders/CeruleanCave1F.asm
@@ -0,0 +1,8 @@
+CeruleanCave1F_h:
+	db CAVERN ; tileset
+	db CERULEAN_CAVE_1F_HEIGHT, CERULEAN_CAVE_1F_WIDTH ; dimensions (y, x)
+	dw CeruleanCave1F_Blocks ; blocks
+	dw CeruleanCave1F_TextPointers ; texts
+	dw CeruleanCave1F_Script ; scripts
+	db 0 ; connections
+	dw CeruleanCave1F_Object ; objects
diff --git a/data/mapHeaders/CeruleanCave2F.asm b/data/mapHeaders/CeruleanCave2F.asm
new file mode 100755
index 00000000..7cf82371
--- /dev/null
+++ b/data/mapHeaders/CeruleanCave2F.asm
@@ -0,0 +1,8 @@
+CeruleanCave2F_h:
+	db CAVERN ; tileset
+	db CERULEAN_CAVE_2F_HEIGHT, CERULEAN_CAVE_2F_WIDTH ; dimensions (y, x)
+	dw CeruleanCave2F_Blocks ; blocks
+	dw CeruleanCave2F_TextPointers ; texts
+	dw CeruleanCave2F_Script ; scripts
+	db 0 ; connections
+	dw CeruleanCave2F_Object ; objects
diff --git a/data/mapHeaders/CeruleanCaveB1F.asm b/data/mapHeaders/CeruleanCaveB1F.asm
new file mode 100755
index 00000000..eb940faa
--- /dev/null
+++ b/data/mapHeaders/CeruleanCaveB1F.asm
@@ -0,0 +1,8 @@
+CeruleanCaveB1F_h:
+	db CAVERN ; tileset
+	db CERULEAN_CAVE_B1F_HEIGHT, CERULEAN_CAVE_B1F_WIDTH ; dimensions (y, x)
+	dw CeruleanCaveB1F_Blocks ; blocks
+	dw CeruleanCaveB1F_TextPointers ; texts
+	dw CeruleanCaveB1F_Script ; scripts
+	db 0 ; connections
+	dw CeruleanCaveB1F_Object ; objects
diff --git a/data/mapHeaders/CeruleanCity.asm b/data/mapHeaders/CeruleanCity.asm
new file mode 100755
index 00000000..cd5444ab
--- /dev/null
+++ b/data/mapHeaders/CeruleanCity.asm
@@ -0,0 +1,12 @@
+CeruleanCity_h:
+	db OVERWORLD ; tileset
+	db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x)
+	dw CeruleanCity_Blocks ; blocks
+	dw CeruleanCity_TextPointers ; texts
+	dw CeruleanCity_Script ; scripts
+	db NORTH | SOUTH | WEST | EAST ; connections
+	NORTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_24, 5, 0, Route24_Blocks
+	SOUTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_5, 5, 0, Route5_Blocks, 1
+	WEST_MAP_CONNECTION CERULEAN_CITY, ROUTE_4, 4, 0, Route4_Blocks
+	EAST_MAP_CONNECTION CERULEAN_CITY, ROUTE_9, 4, 0, Route9_Blocks
+	dw CeruleanCity_Object ; objects
diff --git a/data/mapHeaders/CeruleanGym.asm b/data/mapHeaders/CeruleanGym.asm
new file mode 100755
index 00000000..3bdb0283
--- /dev/null
+++ b/data/mapHeaders/CeruleanGym.asm
@@ -0,0 +1,8 @@
+CeruleanGym_h:
+	db GYM ; tileset
+	db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x)
+	dw CeruleanGym_Blocks ; blocks
+	dw CeruleanGym_TextPointers ; texts
+	dw CeruleanGym_Script ; scripts
+	db 0 ; connections
+	dw CeruleanGym_Object ; objects
diff --git a/data/mapHeaders/CeruleanMart.asm b/data/mapHeaders/CeruleanMart.asm
new file mode 100755
index 00000000..f020d4a3
--- /dev/null
+++ b/data/mapHeaders/CeruleanMart.asm
@@ -0,0 +1,8 @@
+CeruleanMart_h:
+	db MART ; tileset
+	db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x)
+	dw CeruleanMart_Blocks ; blocks
+	dw CeruleanMart_TextPointers ; texts
+	dw CeruleanMart_Script ; scripts
+	db 0 ; connections
+	dw CeruleanMart_Object ; objects
diff --git a/data/mapHeaders/CeruleanPokecenter.asm b/data/mapHeaders/CeruleanPokecenter.asm
new file mode 100755
index 00000000..3286acbb
--- /dev/null
+++ b/data/mapHeaders/CeruleanPokecenter.asm
@@ -0,0 +1,8 @@
+CeruleanPokecenter_h:
+	db POKECENTER ; tileset
+	db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x)
+	dw CeruleanPokecenter_Blocks ; blocks
+	dw CeruleanPokecenter_TextPointers ; texts
+	dw CeruleanPokecenter_Script ; scripts
+	db 0 ; connections
+	dw CeruleanPokecenter_Object ; objects
diff --git a/data/mapHeaders/CeruleanTradeHouse.asm b/data/mapHeaders/CeruleanTradeHouse.asm
new file mode 100755
index 00000000..23c5062c
--- /dev/null
+++ b/data/mapHeaders/CeruleanTradeHouse.asm
@@ -0,0 +1,8 @@
+CeruleanTradeHouse_h:
+	db HOUSE ; tileset
+	db CERULEAN_TRADE_HOUSE_HEIGHT, CERULEAN_TRADE_HOUSE_WIDTH ; dimensions (y, x)
+	dw CeruleanTradeHouse_Blocks ; blocks
+	dw CeruleanTradeHouse_TextPointers ; texts
+	dw CeruleanTradeHouse_Script ; scripts
+	db 0 ; connections
+	dw CeruleanTradeHouse_Object ; objects
diff --git a/data/mapHeaders/CeruleanTrashedHouse.asm b/data/mapHeaders/CeruleanTrashedHouse.asm
new file mode 100755
index 00000000..e105b1ed
--- /dev/null
+++ b/data/mapHeaders/CeruleanTrashedHouse.asm
@@ -0,0 +1,8 @@
+CeruleanTrashedHouse_h:
+	db HOUSE ; tileset
+	db CERULEAN_TRASHED_HOUSE_HEIGHT, CERULEAN_TRASHED_HOUSE_WIDTH ; dimensions (y, x)
+	dw CeruleanTrashedHouse_Blocks ; blocks
+	dw CeruleanTrashedHouse_TextPointers ; texts
+	dw CeruleanTrashedHouse_Script ; scripts
+	db 0 ; connections
+	dw CeruleanTrashedHouse_Object ; objects
diff --git a/data/mapHeaders/ChampionsRoom.asm b/data/mapHeaders/ChampionsRoom.asm
new file mode 100755
index 00000000..a22b236a
--- /dev/null
+++ b/data/mapHeaders/ChampionsRoom.asm
@@ -0,0 +1,8 @@
+ChampionsRoom_h:
+	db GYM ; tileset
+	db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; dimensions (y, x)
+	dw ChampionsRoom_Blocks ; blocks
+	dw ChampionsRoom_TextPointers ; texts
+	dw ChampionsRoom_Script ; scripts
+	db $0 ; connections
+	dw ChampionsRoom_Object ; objects
diff --git a/data/mapHeaders/CinnabarGym.asm b/data/mapHeaders/CinnabarGym.asm
new file mode 100755
index 00000000..e871b8f3
--- /dev/null
+++ b/data/mapHeaders/CinnabarGym.asm
@@ -0,0 +1,8 @@
+CinnabarGym_h:
+	db FACILITY ; tileset
+	db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x)
+	dw CinnabarGym_Blocks ; blocks
+	dw CinnabarGym_TextPointers ; texts
+	dw CinnabarGym_Script ; scripts
+	db 0 ; connections
+	dw CinnabarGym_Object ; objects
diff --git a/data/mapHeaders/CinnabarIsland.asm b/data/mapHeaders/CinnabarIsland.asm
new file mode 100755
index 00000000..b8c5d7d4
--- /dev/null
+++ b/data/mapHeaders/CinnabarIsland.asm
@@ -0,0 +1,10 @@
+CinnabarIsland_h:
+	db OVERWORLD ; tileset
+	db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x)
+	dw CinnabarIsland_Blocks ; blocks
+	dw CinnabarIsland_TextPointers ; texts
+	dw CinnabarIsland_Script ; scripts
+	db NORTH | EAST ; connections
+	NORTH_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_21, 0, 0, Route21_Blocks
+	EAST_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_20, 0, 0, Route20_Blocks
+	dw CinnabarIsland_Object ; objects
diff --git a/data/mapHeaders/CinnabarLab.asm b/data/mapHeaders/CinnabarLab.asm
new file mode 100755
index 00000000..c1167960
--- /dev/null
+++ b/data/mapHeaders/CinnabarLab.asm
@@ -0,0 +1,8 @@
+CinnabarLab_h:
+	db LAB ; tileset
+	db CINNABAR_LAB_HEIGHT, CINNABAR_LAB_WIDTH ; dimensions (y, x)
+	dw CinnabarLab_Blocks ; blocks
+	dw CinnabarLab_TextPointers ; texts
+	dw CinnabarLab_Script ; scripts
+	db 0 ; connections
+	dw CinnabarLab_Object ; objects
diff --git a/data/mapHeaders/CinnabarLabFossilRoom.asm b/data/mapHeaders/CinnabarLabFossilRoom.asm
new file mode 100755
index 00000000..4ac2963b
--- /dev/null
+++ b/data/mapHeaders/CinnabarLabFossilRoom.asm
@@ -0,0 +1,8 @@
+CinnabarLabFossilRoom_h:
+	db LAB ; tileset
+	db CINNABAR_LAB_FOSSIL_ROOM_HEIGHT, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; dimensions (y, x)
+	dw CinnabarLabFossilRoom_Blocks ; blocks
+	dw CinnabarLabFossilRoom_TextPointers ; texts
+	dw CinnabarLabFossilRoom_Script ; scripts
+	db 0 ; connections
+	dw CinnabarLabFossilRoom_Object ; objects
diff --git a/data/mapHeaders/CinnabarLabMetronomeRoom.asm b/data/mapHeaders/CinnabarLabMetronomeRoom.asm
new file mode 100755
index 00000000..8eb9e502
--- /dev/null
+++ b/data/mapHeaders/CinnabarLabMetronomeRoom.asm
@@ -0,0 +1,8 @@
+CinnabarLabMetronomeRoom_h:
+	db LAB ; tileset
+	db CINNABAR_LAB_METRONOME_ROOM_HEIGHT, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; dimensions (y, x)
+	dw CinnabarLabMetronomeRoom_Blocks ; blocks
+	dw CinnabarLabMetronomeRoom_TextPointers ; texts
+	dw CinnabarLabMetronomeRoom_Script ; scripts
+	db 0 ; connections
+	dw CinnabarLabMetronomeRoom_Object ; objects
diff --git a/data/mapHeaders/CinnabarLabTradeRoom.asm b/data/mapHeaders/CinnabarLabTradeRoom.asm
new file mode 100755
index 00000000..1e0ffd0e
--- /dev/null
+++ b/data/mapHeaders/CinnabarLabTradeRoom.asm
@@ -0,0 +1,8 @@
+CinnabarLabTradeRoom_h:
+	db LAB ; tileset
+	db CINNABAR_LAB_TRADE_ROOM_HEIGHT, CINNABAR_LAB_TRADE_ROOM_WIDTH ; dimensions (y, x)
+	dw CinnabarLabTradeRoom_Blocks ; blocks
+	dw CinnabarLabTradeRoom_TextPointers ; texts
+	dw CinnabarLabTradeRoom_Script ; scripts
+	db 0 ; connections
+	dw CinnabarLabTradeRoom_Object ; objects
diff --git a/data/mapHeaders/CinnabarMart.asm b/data/mapHeaders/CinnabarMart.asm
new file mode 100755
index 00000000..5833b2ef
--- /dev/null
+++ b/data/mapHeaders/CinnabarMart.asm
@@ -0,0 +1,8 @@
+CinnabarMart_h:
+	db MART ; tileset
+	db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x)
+	dw CinnabarMart_Blocks ; blocks
+	dw CinnabarMart_TextPointers ; texts
+	dw CinnabarMart_Script ; scripts
+	db 0 ; connections
+	dw CinnabarMart_Object ; objects
diff --git a/data/mapHeaders/CinnabarPokecenter.asm b/data/mapHeaders/CinnabarPokecenter.asm
new file mode 100755
index 00000000..9c54b9b9
--- /dev/null
+++ b/data/mapHeaders/CinnabarPokecenter.asm
@@ -0,0 +1,8 @@
+CinnabarPokecenter_h:
+	db POKECENTER ; tileset
+	db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x)
+	dw CinnabarPokecenter_Blocks ; blocks
+	dw CinnabarPokecenter_TextPointers ; texts
+	dw CinnabarPokecenter_Script ; scripts
+	db 0 ; connections
+	dw CinnabarPokecenter_Object ; objects
diff --git a/data/mapHeaders/Colosseum.asm b/data/mapHeaders/Colosseum.asm
new file mode 100755
index 00000000..9b106204
--- /dev/null
+++ b/data/mapHeaders/Colosseum.asm
@@ -0,0 +1,8 @@
+Colosseum_h:
+	db CLUB ; tileset
+	db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x)
+	dw Colosseum_Blocks ; blocks
+	dw Colosseum_TextPointers ; texts
+	dw Colosseum_Script ; scripts
+	db 0 ; connections
+	dw Colosseum_Object ; objects
diff --git a/data/mapHeaders/CopycatsHouse1F.asm b/data/mapHeaders/CopycatsHouse1F.asm
new file mode 100755
index 00000000..f3cfc261
--- /dev/null
+++ b/data/mapHeaders/CopycatsHouse1F.asm
@@ -0,0 +1,8 @@
+CopycatsHouse1F_h:
+	db REDS_HOUSE_1 ; tileset
+	db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x)
+	dw CopycatsHouse1F_Blocks ; blocks
+	dw CopycatsHouse1F_TextPointers ; texts
+	dw CopycatsHouse1F_Script ; scripts
+	db 0 ; connections
+	dw CopycatsHouse1F_Object ; objects
diff --git a/data/mapHeaders/CopycatsHouse2F.asm b/data/mapHeaders/CopycatsHouse2F.asm
new file mode 100755
index 00000000..453ba455
--- /dev/null
+++ b/data/mapHeaders/CopycatsHouse2F.asm
@@ -0,0 +1,8 @@
+CopycatsHouse2F_h:
+	db REDS_HOUSE_2 ; tileset
+	db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x)
+	dw CopycatsHouse2F_Blocks ; blocks
+	dw CopycatsHouse2F_TextPointers ; texts
+	dw CopycatsHouse2F_Script ; scripts
+	db 0 ; connections
+	dw CopycatsHouse2F_Object ; objects
diff --git a/data/mapHeaders/Daycare.asm b/data/mapHeaders/Daycare.asm
new file mode 100755
index 00000000..2fb7a771
--- /dev/null
+++ b/data/mapHeaders/Daycare.asm
@@ -0,0 +1,8 @@
+Daycare_h:
+	db HOUSE ; tileset
+	db DAYCARE_HEIGHT, DAYCARE_WIDTH ; dimensions (y, x)
+	dw Daycare_Blocks ; blocks
+	dw Daycare_TextPointers ; texts
+	dw Daycare_Script ; scripts
+	db 0 ; connections
+	dw Daycare_Object ; objects
diff --git a/data/mapHeaders/DiglettsCave.asm b/data/mapHeaders/DiglettsCave.asm
new file mode 100755
index 00000000..096019de
--- /dev/null
+++ b/data/mapHeaders/DiglettsCave.asm
@@ -0,0 +1,8 @@
+DiglettsCave_h:
+	db CAVERN ; tileset
+	db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x)
+	dw DiglettsCave_Blocks ; blocks
+	dw DiglettsCave_TextPointers ; texts
+	dw DiglettsCave_Script ; scripts
+	db 0 ; connections
+	dw DiglettsCave_Object ; objects
diff --git a/data/mapHeaders/DiglettsCaveRoute11.asm b/data/mapHeaders/DiglettsCaveRoute11.asm
new file mode 100755
index 00000000..363859b2
--- /dev/null
+++ b/data/mapHeaders/DiglettsCaveRoute11.asm
@@ -0,0 +1,8 @@
+DiglettsCaveRoute11_h:
+	db CAVERN ; tileset
+	db DIGLETTS_CAVE_ROUTE_11_HEIGHT, DIGLETTS_CAVE_ROUTE_11_WIDTH ; dimensions (y, x)
+	dw DiglettsCaveRoute11_Blocks ; blocks
+	dw DiglettsCaveRoute11_TextPointers ; texts
+	dw DiglettsCaveRoute11_Script ; scripts
+	db 0 ; connections
+	dw DiglettsCaveRoute11_Object ; objects
diff --git a/data/mapHeaders/DiglettsCaveRoute2.asm b/data/mapHeaders/DiglettsCaveRoute2.asm
new file mode 100755
index 00000000..c977415b
--- /dev/null
+++ b/data/mapHeaders/DiglettsCaveRoute2.asm
@@ -0,0 +1,8 @@
+DiglettsCaveRoute2_h:
+	db CAVERN ; tileset
+	db DIGLETTS_CAVE_ROUTE_2_HEIGHT, DIGLETTS_CAVE_ROUTE_2_WIDTH ; dimensions (y, x)
+	dw DiglettsCaveRoute2_Blocks ; blocks
+	dw DiglettsCaveRoute2_TextPointers ; texts
+	dw DiglettsCaveRoute2_Script ; scripts
+	db 0 ; connections
+	dw DiglettsCaveRoute2_Object ; objects
diff --git a/data/mapHeaders/FightingDojo.asm b/data/mapHeaders/FightingDojo.asm
new file mode 100755
index 00000000..5c802843
--- /dev/null
+++ b/data/mapHeaders/FightingDojo.asm
@@ -0,0 +1,8 @@
+FightingDojo_h:
+	db DOJO ; tileset
+	db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x)
+	dw FightingDojo_Blocks ; blocks
+	dw FightingDojo_TextPointers ; texts
+	dw FightingDojo_Script ; scripts
+	db 0 ; connections
+	dw FightingDojo_Object ; objects
diff --git a/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm b/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm
new file mode 100755
index 00000000..bc4fe8e6
--- /dev/null
+++ b/data/mapHeaders/FuchsiaBillsGrandpasHouse.asm
@@ -0,0 +1,8 @@
+FuchsiaBillsGrandpasHouse_h:
+	db HOUSE ; tileset
+	db FUCHSIA_BILLS_GRANDPAS_HOUSE_HEIGHT, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH ; dimensions (y, x)
+	dw FuchsiaBillsGrandpasHouse_Blocks ; blocks
+	dw FuchsiaBillsGrandpasHouse_TextPointers ; texts
+	dw FuchsiaBillsGrandpasHouse_Script ; scripts
+	db 0 ; connections
+	dw FuchsiaBillsGrandpasHouse_Object ; objects
diff --git a/data/mapHeaders/FuchsiaCity.asm b/data/mapHeaders/FuchsiaCity.asm
new file mode 100755
index 00000000..87398877
--- /dev/null
+++ b/data/mapHeaders/FuchsiaCity.asm
@@ -0,0 +1,11 @@
+FuchsiaCity_h:
+	db OVERWORLD ; tileset
+	db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x)
+	dw FuchsiaCity_Blocks ; blocks
+	dw FuchsiaCity_TextPointers ; texts
+	dw FuchsiaCity_Script ; scripts
+	db SOUTH | WEST | EAST ; connections
+	SOUTH_MAP_CONNECTION FUCHSIA_CITY, ROUTE_19, 5, 0, Route19_Blocks
+	WEST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_18, 4, 0, Route18_Blocks
+	EAST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_15, 4, 0, Route15_Blocks
+	dw FuchsiaCity_Object ; objects
diff --git a/data/mapHeaders/FuchsiaGoodRodHouse.asm b/data/mapHeaders/FuchsiaGoodRodHouse.asm
new file mode 100755
index 00000000..4871970e
--- /dev/null
+++ b/data/mapHeaders/FuchsiaGoodRodHouse.asm
@@ -0,0 +1,8 @@
+FuchsiaGoodRodHouse_h:
+	db SHIP ; tileset
+	db FUCHSIA_GOOD_ROD_HOUSE_HEIGHT, FUCHSIA_GOOD_ROD_HOUSE_WIDTH ; dimensions (y, x)
+	dw FuchsiaGoodRodHouse_Blocks ; blocks
+	dw FuchsiaGoodRodHouse_TextPointers ; texts
+	dw FuchsiaGoodRodHouse_Script ; scripts
+	db 0 ; connections
+	dw FuchsiaGoodRodHouse_Object ; objects
diff --git a/data/mapHeaders/FuchsiaGym.asm b/data/mapHeaders/FuchsiaGym.asm
new file mode 100755
index 00000000..71ef5960
--- /dev/null
+++ b/data/mapHeaders/FuchsiaGym.asm
@@ -0,0 +1,8 @@
+FuchsiaGym_h:
+	db GYM ; tileset
+	db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x)
+	dw FuchsiaGym_Blocks ; blocks
+	dw FuchsiaGym_TextPointers ; texts
+	dw FuchsiaGym_Script ; scripts
+	db 0 ; connections
+	dw FuchsiaGym_Object ; objects
diff --git a/data/mapHeaders/FuchsiaMart.asm b/data/mapHeaders/FuchsiaMart.asm
new file mode 100755
index 00000000..7c1c34d2
--- /dev/null
+++ b/data/mapHeaders/FuchsiaMart.asm
@@ -0,0 +1,8 @@
+FuchsiaMart_h:
+	db MART ; tileset
+	db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x)
+	dw FuchsiaMart_Blocks ; blocks
+	dw FuchsiaMart_TextPointers ; texts
+	dw FuchsiaMart_Script ; scripts
+	db 0 ; connections
+	dw FuchsiaMart_Object ; objects
diff --git a/data/mapHeaders/FuchsiaMeetingRoom.asm b/data/mapHeaders/FuchsiaMeetingRoom.asm
new file mode 100755
index 00000000..8bc0cdbf
--- /dev/null
+++ b/data/mapHeaders/FuchsiaMeetingRoom.asm
@@ -0,0 +1,8 @@
+FuchsiaMeetingRoom_h:
+	db LAB ; tileset
+	db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x)
+	dw FuchsiaMeetingRoom_Blocks ; blocks
+	dw FuchsiaMeetingRoom_TextPointers ; texts
+	dw FuchsiaMeetingRoom_Script ; scripts
+	db 0 ; connections
+	dw FuchsiaMeetingRoom_Object ; objects
diff --git a/data/mapHeaders/FuchsiaPokecenter.asm b/data/mapHeaders/FuchsiaPokecenter.asm
new file mode 100755
index 00000000..bf654ea6
--- /dev/null
+++ b/data/mapHeaders/FuchsiaPokecenter.asm
@@ -0,0 +1,8 @@
+FuchsiaPokecenter_h:
+	db POKECENTER ; tileset
+	db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x)
+	dw FuchsiaPokecenter_Blocks ; blocks
+	dw FuchsiaPokecenter_TextPointers ; texts
+	dw FuchsiaPokecenter_Script ; scripts
+	db 0 ; connections
+	dw FuchsiaPokecenter_Object ; objects
diff --git a/data/mapHeaders/GameCorner.asm b/data/mapHeaders/GameCorner.asm
new file mode 100755
index 00000000..c8b69724
--- /dev/null
+++ b/data/mapHeaders/GameCorner.asm
@@ -0,0 +1,8 @@
+GameCorner_h:
+	db LOBBY ; tileset
+	db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x)
+	dw GameCorner_Blocks ; blocks
+	dw GameCorner_TextPointers ; texts
+	dw GameCorner_Script ; scripts
+	db 0 ; connections
+	dw GameCorner_Object ; objects
diff --git a/data/mapHeaders/GameCornerPrizeRoom.asm b/data/mapHeaders/GameCornerPrizeRoom.asm
new file mode 100755
index 00000000..e43d2ec7
--- /dev/null
+++ b/data/mapHeaders/GameCornerPrizeRoom.asm
@@ -0,0 +1,8 @@
+GameCornerPrizeRoom_h:
+	db LOBBY ; tileset
+	db GAME_CORNER_PRIZE_ROOM_HEIGHT, GAME_CORNER_PRIZE_ROOM_WIDTH ; dimensions (y, x)
+	dw GameCornerPrizeRoom_Blocks ; blocks
+	dw GameCornerPrizeRoom_TextPointers ; texts
+	dw GameCornerPrizeRoom_Script ; scripts
+	db 0 ; connections
+	dw GameCornerPrizeRoom_Object ; objects
diff --git a/data/mapHeaders/HallOfFame.asm b/data/mapHeaders/HallOfFame.asm
new file mode 100755
index 00000000..e7f7a982
--- /dev/null
+++ b/data/mapHeaders/HallOfFame.asm
@@ -0,0 +1,8 @@
+HallOfFame_h:
+	db GYM ; tileset
+	db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x)
+	dw HallOfFame_Blocks ; blocks
+	dw HallOfFame_TextPointers ; texts
+	dw HallOfFame_Script ; scripts
+	db 0 ; connections
+	dw HallOfFame_Object ; objects
diff --git a/data/mapHeaders/IndigoPlateau.asm b/data/mapHeaders/IndigoPlateau.asm
new file mode 100755
index 00000000..ee8b2f0c
--- /dev/null
+++ b/data/mapHeaders/IndigoPlateau.asm
@@ -0,0 +1,9 @@
+IndigoPlateau_h:
+	db PLATEAU ; tileset
+	db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x)
+	dw IndigoPlateau_Blocks ; blocks
+	dw IndigoPlateau_TextPointers ; texts
+	dw IndigoPlateau_Script ; scripts
+	db SOUTH ; connections
+	SOUTH_MAP_CONNECTION INDIGO_PLATEAU, ROUTE_23, 0, 0, Route23_Blocks
+	dw IndigoPlateau_Object ; objects
diff --git a/data/mapHeaders/IndigoPlateauLobby.asm b/data/mapHeaders/IndigoPlateauLobby.asm
new file mode 100755
index 00000000..f099c87d
--- /dev/null
+++ b/data/mapHeaders/IndigoPlateauLobby.asm
@@ -0,0 +1,8 @@
+IndigoPlateauLobby_h:
+	db MART ; tileset
+	db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x)
+	dw IndigoPlateauLobby_Blocks ; blocks
+	dw IndigoPlateauLobby_TextPointers ; texts
+	dw IndigoPlateauLobby_Script ; scripts
+	db 0 ; connections
+	dw IndigoPlateauLobby_Object ; objects
diff --git a/data/mapHeaders/LancesRoom.asm b/data/mapHeaders/LancesRoom.asm
new file mode 100755
index 00000000..a9cea4b6
--- /dev/null
+++ b/data/mapHeaders/LancesRoom.asm
@@ -0,0 +1,8 @@
+LancesRoom_h:
+	db DOJO ; tileset
+	db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x)
+	dw LancesRoom_Blocks ; blocks
+	dw LancesRoom_TextPointers ; texts
+	dw LancesRoom_Script ; scripts
+	db 0 ; connections
+	dw LancesRoom_Object ; objects
diff --git a/data/mapHeaders/LavenderCuboneHouse.asm b/data/mapHeaders/LavenderCuboneHouse.asm
new file mode 100755
index 00000000..06e9cb40
--- /dev/null
+++ b/data/mapHeaders/LavenderCuboneHouse.asm
@@ -0,0 +1,8 @@
+LavenderCuboneHouse_h:
+	db HOUSE ; tileset
+	db LAVENDER_CUBONE_HOUSE_HEIGHT, LAVENDER_CUBONE_HOUSE_WIDTH ; dimensions (y, x)
+	dw LavenderCuboneHouse_Blocks ; blocks
+	dw LavenderCuboneHouse_TextPointers ; texts
+	dw LavenderCuboneHouse_Script ; scripts
+	db 0 ; connections
+	dw LavenderCuboneHouse_Object ; objects
diff --git a/data/mapHeaders/LavenderMart.asm b/data/mapHeaders/LavenderMart.asm
new file mode 100755
index 00000000..c6869d3c
--- /dev/null
+++ b/data/mapHeaders/LavenderMart.asm
@@ -0,0 +1,8 @@
+LavenderMart_h:
+	db MART ; tileset
+	db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x)
+	dw LavenderMart_Blocks ; blocks
+	dw LavenderMart_TextPointers ; texts
+	dw LavenderMart_Script ; scripts
+	db 0 ; connections
+	dw LavenderMart_Object ; objects
diff --git a/data/mapHeaders/LavenderPokecenter.asm b/data/mapHeaders/LavenderPokecenter.asm
new file mode 100755
index 00000000..820e19cd
--- /dev/null
+++ b/data/mapHeaders/LavenderPokecenter.asm
@@ -0,0 +1,8 @@
+LavenderPokecenter_h:
+	db POKECENTER ; tileset
+	db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x)
+	dw LavenderPokecenter_Blocks ; blocks
+	dw LavenderPokecenter_TextPointers ; texts
+	dw LavenderPokecenter_Script ; scripts
+	db 0 ; connections
+	dw LavenderPokecenter_Object ; objects
diff --git a/data/mapHeaders/LavenderTown.asm b/data/mapHeaders/LavenderTown.asm
new file mode 100755
index 00000000..99c9515d
--- /dev/null
+++ b/data/mapHeaders/LavenderTown.asm
@@ -0,0 +1,11 @@
+LavenderTown_h:
+	db OVERWORLD ; tileset
+	db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x)
+	dw LavenderTown_Blocks ; blocks
+	dw LavenderTown_TextPointers ; texts
+	dw LavenderTown_Script ; scripts
+	db NORTH | SOUTH | WEST ; connections
+	NORTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_10, 0, 0, Route10_Blocks
+	SOUTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_12, 0, 0, Route12_Blocks, 1
+	WEST_MAP_CONNECTION LAVENDER_TOWN, ROUTE_8, 0, 0, Route8_Blocks
+	dw LavenderTown_Object ; objects
diff --git a/data/mapHeaders/LoreleisRoom.asm b/data/mapHeaders/LoreleisRoom.asm
new file mode 100755
index 00000000..216b6621
--- /dev/null
+++ b/data/mapHeaders/LoreleisRoom.asm
@@ -0,0 +1,8 @@
+LoreleisRoom_h:
+	db GYM ; tileset
+	db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x)
+	dw LoreleisRoom_Blocks ; blocks
+	dw LoreleisRoom_TextPointers ; texts
+	dw LoreleisRoom_Script ; scripts
+	db 0 ; connections
+	dw LoreleisRoom_Object ; objects
diff --git a/data/mapHeaders/MrFujisHouse.asm b/data/mapHeaders/MrFujisHouse.asm
new file mode 100755
index 00000000..4ae9c5b7
--- /dev/null
+++ b/data/mapHeaders/MrFujisHouse.asm
@@ -0,0 +1,8 @@
+MrFujisHouse_h:
+	db HOUSE ; tileset
+	db MR_FUJIS_HOUSE_HEIGHT, MR_FUJIS_HOUSE_WIDTH ; dimensions (y, x)
+	dw MrFujisHouse_Blocks ; blocks
+	dw MrFujisHouse_TextPointers ; texts
+	dw MrFujisHouse_Script ; scripts
+	db 0 ; connections
+	dw MrFujisHouse_Object ; objects
diff --git a/data/mapHeaders/MrPsychicsHouse.asm b/data/mapHeaders/MrPsychicsHouse.asm
new file mode 100755
index 00000000..5e4ce91b
--- /dev/null
+++ b/data/mapHeaders/MrPsychicsHouse.asm
@@ -0,0 +1,8 @@
+MrPsychicsHouse_h:
+	db HOUSE ; tileset
+	db MR_PSYCHICS_HOUSE_HEIGHT, MR_PSYCHICS_HOUSE_WIDTH ; dimensions (y, x)
+	dw MrPsychicsHouse_Blocks ; blocks
+	dw MrPsychicsHouse_TextPointers ; texts
+	dw MrPsychicsHouse_Script ; scripts
+	db 0 ; connections
+	dw MrPsychicsHouse_Object ; objects
diff --git a/data/mapHeaders/MtMoon1F.asm b/data/mapHeaders/MtMoon1F.asm
new file mode 100755
index 00000000..29ce5d6b
--- /dev/null
+++ b/data/mapHeaders/MtMoon1F.asm
@@ -0,0 +1,8 @@
+MtMoon1F_h:
+	db CAVERN ; tileset
+	db MT_MOON_1F_HEIGHT, MT_MOON_1F_WIDTH ; dimensions (y, x)
+	dw MtMoon1F_Blocks ; blocks
+	dw MtMoon1F_TextPointers ; texts
+	dw MtMoon1F_Script ; scripts
+	db 0 ; connections
+	dw MtMoon1F_Object ; objects
diff --git a/data/mapHeaders/MtMoonB1F.asm b/data/mapHeaders/MtMoonB1F.asm
new file mode 100755
index 00000000..7ebc3dab
--- /dev/null
+++ b/data/mapHeaders/MtMoonB1F.asm
@@ -0,0 +1,8 @@
+MtMoonB1F_h:
+	db CAVERN ; tileset
+	db MT_MOON_B1F_HEIGHT, MT_MOON_B1F_WIDTH ; dimensions (y, x)
+	dw MtMoonB1F_Blocks ; blocks
+	dw MtMoonB1F_TextPointers ; texts
+	dw MtMoonB1F_Script ; scripts
+	db 0 ; connections
+	dw MtMoonB1F_Object ; objects
diff --git a/data/mapHeaders/MtMoonB2F.asm b/data/mapHeaders/MtMoonB2F.asm
new file mode 100755
index 00000000..2ec86247
--- /dev/null
+++ b/data/mapHeaders/MtMoonB2F.asm
@@ -0,0 +1,8 @@
+MtMoonB2F_h:
+	db CAVERN ; tileset
+	db MT_MOON_B2F_HEIGHT, MT_MOON_B2F_WIDTH ; dimensions (y, x)
+	dw MtMoonB2F_Blocks ; blocks
+	dw MtMoonB2F_TextPointers ; texts
+	dw MtMoonB2F_Script ; scripts
+	db 0 ; connections
+	dw MtMoonB2F_Object ; objects
diff --git a/data/mapHeaders/MtMoonPokecenter.asm b/data/mapHeaders/MtMoonPokecenter.asm
new file mode 100755
index 00000000..c3c014ff
--- /dev/null
+++ b/data/mapHeaders/MtMoonPokecenter.asm
@@ -0,0 +1,8 @@
+MtMoonPokecenter_h:
+	db POKECENTER ; tileset
+	db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x)
+	dw MtMoonPokecenter_Blocks ; blocks
+	dw MtMoonPokecenter_TextPointers ; texts
+	dw MtMoonPokecenter_Script ; scripts
+	db 0 ; connections
+	dw MtMoonPokecenter_Object ; objects
diff --git a/data/mapHeaders/Museum1F.asm b/data/mapHeaders/Museum1F.asm
new file mode 100755
index 00000000..55625fc4
--- /dev/null
+++ b/data/mapHeaders/Museum1F.asm
@@ -0,0 +1,8 @@
+Museum1F_h:
+	db MUSEUM ; tileset
+	db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x)
+	dw Museum1F_Blocks ; blocks
+	dw Museum1F_TextPointers ; texts
+	dw Museum1F_Script ; scripts
+	db 0 ; connections
+	dw Museum1F_Object ; objects
diff --git a/data/mapHeaders/Museum2F.asm b/data/mapHeaders/Museum2F.asm
new file mode 100755
index 00000000..b39e161d
--- /dev/null
+++ b/data/mapHeaders/Museum2F.asm
@@ -0,0 +1,8 @@
+Museum2F_h:
+	db MUSEUM ; tileset
+	db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x)
+	dw Museum2F_Blocks ; blocks
+	dw Museum2F_TextPointers ; texts
+	dw Museum2F_Script ; scripts
+	db 0 ; connections
+	dw Museum2F_Object ; objects
diff --git a/data/mapHeaders/NameRatersHouse.asm b/data/mapHeaders/NameRatersHouse.asm
new file mode 100755
index 00000000..7e3acee1
--- /dev/null
+++ b/data/mapHeaders/NameRatersHouse.asm
@@ -0,0 +1,8 @@
+NameRatersHouse_h:
+	db HOUSE ; tileset
+	db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x)
+	dw NameRatersHouse_Blocks ; blocks
+	dw NameRatersHouse_TextPointers ; texts
+	dw NameRatersHouse_Script ; scripts
+	db 0 ; connections
+	dw NameRatersHouse_Object ; objects
diff --git a/data/mapHeaders/OaksLab.asm b/data/mapHeaders/OaksLab.asm
new file mode 100755
index 00000000..ffbcdd52
--- /dev/null
+++ b/data/mapHeaders/OaksLab.asm
@@ -0,0 +1,8 @@
+OaksLab_h:
+	db DOJO ; tileset
+	db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x)
+	dw OaksLab_Blocks ; blocks
+	dw OaksLab_TextPointers ; texts
+	dw OaksLab_Script ; scripts
+	db 0 ; connections
+	dw OaksLab_Object ; objects
diff --git a/data/mapHeaders/PalletTown.asm b/data/mapHeaders/PalletTown.asm
new file mode 100755
index 00000000..eb8525ae
--- /dev/null
+++ b/data/mapHeaders/PalletTown.asm
@@ -0,0 +1,10 @@
+PalletTown_h:
+	db OVERWORLD ; tileset
+	db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions (y, x)
+	dw PalletTown_Blocks ; blocks
+	dw PalletTown_TextPointers ; texts
+	dw PalletTown_Script ; scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION PALLET_TOWN, ROUTE_1, 0, 0, Route1_Blocks
+	SOUTH_MAP_CONNECTION PALLET_TOWN, ROUTE_21, 0, 0, Route21_Blocks, 1
+	dw PalletTown_Object ; objects
diff --git a/data/mapHeaders/PewterCity.asm b/data/mapHeaders/PewterCity.asm
new file mode 100755
index 00000000..73610f86
--- /dev/null
+++ b/data/mapHeaders/PewterCity.asm
@@ -0,0 +1,10 @@
+PewterCity_h:
+	db OVERWORLD ; tileset
+	db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x)
+	dw PewterCity_Blocks ; blocks
+	dw PewterCity_TextPointers ; texts
+	dw PewterCity_Script ; scripts
+	db SOUTH | EAST ; connections
+	SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2_Blocks
+	EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3_Blocks
+	dw PewterCity_Object ; objects
diff --git a/data/mapHeaders/PewterGym.asm b/data/mapHeaders/PewterGym.asm
new file mode 100755
index 00000000..bb9c2e84
--- /dev/null
+++ b/data/mapHeaders/PewterGym.asm
@@ -0,0 +1,8 @@
+PewterGym_h:
+	db GYM ; tileset
+	db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x)
+	dw PewterGym_Blocks ; blocks
+	dw PewterGym_TextPointers ; texts
+	dw PewterGym_Script ; scripts
+	db 0 ; connections
+	dw PewterGym_Object ; objects
diff --git a/data/mapHeaders/PewterMart.asm b/data/mapHeaders/PewterMart.asm
new file mode 100755
index 00000000..dc8c5c78
--- /dev/null
+++ b/data/mapHeaders/PewterMart.asm
@@ -0,0 +1,8 @@
+PewterMart_h:
+	db MART ; tileset
+	db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x)
+	dw PewterMart_Blocks ; blocks
+	dw PewterMart_TextPointers ; texts
+	dw PewterMart_Script ; scripts
+	db 0 ; connections
+	dw PewterMart_Object ; objects
diff --git a/data/mapHeaders/PewterNidoranHouse.asm b/data/mapHeaders/PewterNidoranHouse.asm
new file mode 100755
index 00000000..ffab8473
--- /dev/null
+++ b/data/mapHeaders/PewterNidoranHouse.asm
@@ -0,0 +1,8 @@
+PewterNidoranHouse_h:
+	db HOUSE ; tileset
+	db PEWTER_NIDORAN_HOUSE_HEIGHT, PEWTER_NIDORAN_HOUSE_WIDTH ; dimensions (y, x)
+	dw PewterNidoranHouse_Blocks ; blocks
+	dw PewterNidoranHouse_TextPointers ; texts
+	dw PewterNidoranHouse_Script ; scripts
+	db 0 ; connections
+	dw PewterNidoranHouse_Object ; objects
diff --git a/data/mapHeaders/PewterPokecenter.asm b/data/mapHeaders/PewterPokecenter.asm
new file mode 100755
index 00000000..89adbb80
--- /dev/null
+++ b/data/mapHeaders/PewterPokecenter.asm
@@ -0,0 +1,8 @@
+PewterPokecenter_h:
+	db POKECENTER ; tileset
+	db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x)
+	dw PewterPokecenter_Blocks ; blocks
+	dw PewterPokecenter_TextPointers ; texts
+	dw PewterPokecenter_Script ; scripts
+	db 0 ; connections
+	dw PewterPokecenter_Object ; objects
diff --git a/data/mapHeaders/PewterSpeechHouse.asm b/data/mapHeaders/PewterSpeechHouse.asm
new file mode 100755
index 00000000..7750c8c7
--- /dev/null
+++ b/data/mapHeaders/PewterSpeechHouse.asm
@@ -0,0 +1,8 @@
+PewterSpeechHouse_h:
+	db HOUSE ; tileset
+	db PEWTER_SPEECH_HOUSE_HEIGHT, PEWTER_SPEECH_HOUSE_WIDTH ; dimensions (y, x)
+	dw PewterSpeechHouse_Blocks ; blocks
+	dw PewterSpeechHouse_TextPointers ; texts
+	dw PewterSpeechHouse_Script ; scripts
+	db 0 ; connections
+	dw PewterSpeechHouse_Object ; objects
diff --git a/data/mapHeaders/PokemonFanClub.asm b/data/mapHeaders/PokemonFanClub.asm
new file mode 100755
index 00000000..18ebb923
--- /dev/null
+++ b/data/mapHeaders/PokemonFanClub.asm
@@ -0,0 +1,8 @@
+PokemonFanClub_h:
+	db INTERIOR ; tileset
+	db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x)
+	dw PokemonFanClub_Blocks ; blocks
+	dw PokemonFanClub_TextPointers ; texts
+	dw PokemonFanClub_Script ; scripts
+	db 0 ; connections
+	dw PokemonFanClub_Object ; objects
diff --git a/data/mapHeaders/PokemonMansion1F.asm b/data/mapHeaders/PokemonMansion1F.asm
new file mode 100755
index 00000000..357b0cbb
--- /dev/null
+++ b/data/mapHeaders/PokemonMansion1F.asm
@@ -0,0 +1,8 @@
+PokemonMansion1F_h:
+	db FACILITY ; tileset
+	db POKEMON_MANSION_1F_HEIGHT, POKEMON_MANSION_1F_WIDTH ; dimensions (y, x)
+	dw PokemonMansion1F_Blocks ; blocks
+	dw PokemonMansion1F_TextPointers ; texts
+	dw PokemonMansion1F_Script ; scripts
+	db 0 ; connections
+	dw PokemonMansion1F_Object ; objects
diff --git a/data/mapHeaders/PokemonMansion2F.asm b/data/mapHeaders/PokemonMansion2F.asm
new file mode 100755
index 00000000..71c0e3bb
--- /dev/null
+++ b/data/mapHeaders/PokemonMansion2F.asm
@@ -0,0 +1,8 @@
+PokemonMansion2F_h:
+	db FACILITY ; tileset
+	db POKEMON_MANSION_2F_HEIGHT, POKEMON_MANSION_2F_WIDTH ; dimensions (y, x)
+	dw PokemonMansion2F_Blocks ; blocks
+	dw PokemonMansion2F_TextPointers ; texts
+	dw PokemonMansion2F_Script ; scripts
+	db 0 ; connections
+	dw PokemonMansion2F_Object ; objects
diff --git a/data/mapHeaders/PokemonMansion3F.asm b/data/mapHeaders/PokemonMansion3F.asm
new file mode 100755
index 00000000..fe4076f9
--- /dev/null
+++ b/data/mapHeaders/PokemonMansion3F.asm
@@ -0,0 +1,8 @@
+PokemonMansion3F_h:
+	db FACILITY ; tileset
+	db POKEMON_MANSION_3F_HEIGHT, POKEMON_MANSION_3F_WIDTH ; dimensions (y, x)
+	dw PokemonMansion3F_Blocks ; blocks
+	dw PokemonMansion3F_TextPointers ; texts
+	dw PokemonMansion3F_Script ; scripts
+	db 0 ; connections
+	dw PokemonMansion3F_Object ; objects
diff --git a/data/mapHeaders/PokemonMansionB1F.asm b/data/mapHeaders/PokemonMansionB1F.asm
new file mode 100755
index 00000000..ccf892b2
--- /dev/null
+++ b/data/mapHeaders/PokemonMansionB1F.asm
@@ -0,0 +1,8 @@
+PokemonMansionB1F_h:
+	db FACILITY ; tileset
+	db POKEMON_MANSION_B1F_HEIGHT, POKEMON_MANSION_B1F_WIDTH ; dimensions (y, x)
+	dw PokemonMansionB1F_Blocks ; blocks
+	dw PokemonMansionB1F_TextPointers ; texts
+	dw PokemonMansionB1F_Script ; scripts
+	db 0 ; connections
+	dw PokemonMansionB1F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower1F.asm b/data/mapHeaders/PokemonTower1F.asm
new file mode 100755
index 00000000..561274bb
--- /dev/null
+++ b/data/mapHeaders/PokemonTower1F.asm
@@ -0,0 +1,8 @@
+PokemonTower1F_h:
+	db CEMETERY ; tileset
+	db POKEMON_TOWER_1F_HEIGHT, POKEMON_TOWER_1F_WIDTH ; dimensions (y, x)
+	dw PokemonTower1F_Blocks ; blocks
+	dw PokemonTower1F_TextPointers ; texts
+	dw PokemonTower1F_Script ; scripts
+	db 0 ; connections
+	dw PokemonTower1F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower2F.asm b/data/mapHeaders/PokemonTower2F.asm
new file mode 100755
index 00000000..41e3271e
--- /dev/null
+++ b/data/mapHeaders/PokemonTower2F.asm
@@ -0,0 +1,8 @@
+PokemonTower2F_h:
+	db CEMETERY ; tileset
+	db POKEMON_TOWER_2F_HEIGHT, POKEMON_TOWER_2F_WIDTH ; dimensions (y, x)
+	dw PokemonTower2F_Blocks ; blocks
+	dw PokemonTower2F_TextPointers ; texts
+	dw PokemonTower2F_Script ; scripts
+	db 0 ; connections
+	dw PokemonTower2F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower3F.asm b/data/mapHeaders/PokemonTower3F.asm
new file mode 100755
index 00000000..932c4a20
--- /dev/null
+++ b/data/mapHeaders/PokemonTower3F.asm
@@ -0,0 +1,8 @@
+PokemonTower3F_h:
+	db CEMETERY ; tileset
+	db POKEMON_TOWER_3F_HEIGHT, POKEMON_TOWER_3F_WIDTH ; dimensions (y, x)
+	dw PokemonTower3F_Blocks ; blocks
+	dw PokemonTower3F_TextPointers ; texts
+	dw PokemonTower3F_Script ; scripts
+	db 0 ; connections
+	dw PokemonTower3F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower4F.asm b/data/mapHeaders/PokemonTower4F.asm
new file mode 100755
index 00000000..b3027cb0
--- /dev/null
+++ b/data/mapHeaders/PokemonTower4F.asm
@@ -0,0 +1,8 @@
+PokemonTower4F_h:
+	db CEMETERY ; tileset
+	db POKEMON_TOWER_4F_HEIGHT, POKEMON_TOWER_4F_WIDTH ; dimensions (y, x)
+	dw PokemonTower4F_Blocks ; blocks
+	dw PokemonTower4F_TextPointers ; texts
+	dw PokemonTower4F_Script ; scripts
+	db 0 ; connections
+	dw PokemonTower4F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower5F.asm b/data/mapHeaders/PokemonTower5F.asm
new file mode 100755
index 00000000..9452c553
--- /dev/null
+++ b/data/mapHeaders/PokemonTower5F.asm
@@ -0,0 +1,8 @@
+PokemonTower5F_h:
+	db CEMETERY ; tileset
+	db POKEMON_TOWER_5F_HEIGHT, POKEMON_TOWER_5F_WIDTH ; dimensions (y, x)
+	dw PokemonTower5F_Blocks ; blocks
+	dw PokemonTower5F_TextPointers ; texts
+	dw PokemonTower5F_Script ; scripts
+	db 0 ; connections
+	dw PokemonTower5F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower6F.asm b/data/mapHeaders/PokemonTower6F.asm
new file mode 100755
index 00000000..336c8f66
--- /dev/null
+++ b/data/mapHeaders/PokemonTower6F.asm
@@ -0,0 +1,8 @@
+PokemonTower6F_h:
+	db CEMETERY ; tileset
+	db POKEMON_TOWER_6F_HEIGHT, POKEMON_TOWER_6F_WIDTH ; dimensions (y, x)
+	dw PokemonTower6F_Blocks ; blocks
+	dw PokemonTower6F_TextPointers ; texts
+	dw PokemonTower6F_Script ; scripts
+	db 0 ; connections
+	dw PokemonTower6F_Object ; objects
diff --git a/data/mapHeaders/PokemonTower7F.asm b/data/mapHeaders/PokemonTower7F.asm
new file mode 100755
index 00000000..da10fa53
--- /dev/null
+++ b/data/mapHeaders/PokemonTower7F.asm
@@ -0,0 +1,8 @@
+PokemonTower7F_h:
+	db CEMETERY ; tileset
+	db POKEMON_TOWER_7F_HEIGHT, POKEMON_TOWER_7F_WIDTH ; dimensions (y, x)
+	dw PokemonTower7F_Blocks ; blocks
+	dw PokemonTower7F_TextPointers ; texts
+	dw PokemonTower7F_Script ; scripts
+	db 0 ; connections
+	dw PokemonTower7F_Object ; objects
diff --git a/data/mapHeaders/PowerPlant.asm b/data/mapHeaders/PowerPlant.asm
new file mode 100755
index 00000000..91f03d63
--- /dev/null
+++ b/data/mapHeaders/PowerPlant.asm
@@ -0,0 +1,8 @@
+PowerPlant_h:
+	db FACILITY ; tileset
+	db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x)
+	dw PowerPlant_Blocks ; blocks
+	dw PowerPlant_TextPointers ; texts
+	dw PowerPlant_Script ; scripts
+	db 0 ; connections
+	dw PowerPlant_Object ; objects
diff --git a/data/mapHeaders/RedsHouse1F.asm b/data/mapHeaders/RedsHouse1F.asm
new file mode 100755
index 00000000..c9acc489
--- /dev/null
+++ b/data/mapHeaders/RedsHouse1F.asm
@@ -0,0 +1,8 @@
+RedsHouse1F_h:
+	db REDS_HOUSE_1 ; tileset
+	db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions (y, x)
+	dw RedsHouse1F_Blocks ; blocks
+	dw RedsHouse1F_TextPointers ; texts
+	dw RedsHouse1F_Script ; scripts
+	db 0 ; connections
+	dw RedsHouse1F_Object ; objects
diff --git a/data/mapHeaders/RedsHouse2F.asm b/data/mapHeaders/RedsHouse2F.asm
new file mode 100755
index 00000000..42215466
--- /dev/null
+++ b/data/mapHeaders/RedsHouse2F.asm
@@ -0,0 +1,8 @@
+RedsHouse2F_h:
+	db REDS_HOUSE_2 ; tileset
+	db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions (y, x)
+	dw RedsHouse2F_Blocks ; blocks
+	dw RedsHouse2F_TextPointers ; texts
+	dw RedsHouse2F_Script ; scripts
+	db $00 ; connections
+	dw RedsHouse2F_Object ; objects
diff --git a/data/mapHeaders/RockTunnel1F.asm b/data/mapHeaders/RockTunnel1F.asm
new file mode 100755
index 00000000..dd552ac9
--- /dev/null
+++ b/data/mapHeaders/RockTunnel1F.asm
@@ -0,0 +1,8 @@
+RockTunnel1F_h:
+	db CAVERN ; tileset
+	db ROCK_TUNNEL_1F_HEIGHT, ROCK_TUNNEL_1F_WIDTH ; dimensions (y, x)
+	dw RockTunnel1F_Blocks ; blocks
+	dw RockTunnel1F_TextPointers ; texts
+	dw RockTunnel1F_Script ; scripts
+	db 0 ; connections
+	dw RockTunnel1F_Object ; objects
diff --git a/data/mapHeaders/RockTunnelB1F.asm b/data/mapHeaders/RockTunnelB1F.asm
new file mode 100755
index 00000000..4e765f20
--- /dev/null
+++ b/data/mapHeaders/RockTunnelB1F.asm
@@ -0,0 +1,8 @@
+RockTunnelB1F_h:
+	db CAVERN ; tileset
+	db ROCK_TUNNEL_B1F_HEIGHT, ROCK_TUNNEL_B1F_WIDTH ; dimensions (y, x)
+	dw RockTunnelB1F_Blocks ; blocks
+	dw RockTunnelB1F_TextPointers ; texts
+	dw RockTunnelB1F_Script ; scripts
+	db 0 ; connections
+	dw RockTunnelB1F_Object ; objects
diff --git a/data/mapHeaders/RockTunnelPokecenter.asm b/data/mapHeaders/RockTunnelPokecenter.asm
new file mode 100755
index 00000000..ac29f1cf
--- /dev/null
+++ b/data/mapHeaders/RockTunnelPokecenter.asm
@@ -0,0 +1,8 @@
+RockTunnelPokecenter_h:
+	db POKECENTER ; tileset
+	db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x)
+	dw RockTunnelPokecenter_Blocks ; blocks
+	dw RockTunnelPokecenter_TextPointers ; texts
+	dw RockTunnelPokecenter_Script ; scripts
+	db 0 ; connections
+	dw RockTunnelPokecenter_Object ; objects
diff --git a/data/mapHeaders/RocketHideoutB1F.asm b/data/mapHeaders/RocketHideoutB1F.asm
new file mode 100755
index 00000000..3c842f1e
--- /dev/null
+++ b/data/mapHeaders/RocketHideoutB1F.asm
@@ -0,0 +1,8 @@
+RocketHideoutB1F_h:
+	db FACILITY ; tileset
+	db ROCKET_HIDEOUT_B1F_HEIGHT, ROCKET_HIDEOUT_B1F_WIDTH ; dimensions (y, x)
+	dw RocketHideoutB1F_Blocks ; blocks
+	dw RocketHideoutB1F_TextPointers ; texts
+	dw RocketHideoutB1F_Script ; scripts
+	db 0 ; connections
+	dw RocketHideoutB1F_Object ; objects
diff --git a/data/mapHeaders/RocketHideoutB2F.asm b/data/mapHeaders/RocketHideoutB2F.asm
new file mode 100755
index 00000000..b570c2a6
--- /dev/null
+++ b/data/mapHeaders/RocketHideoutB2F.asm
@@ -0,0 +1,8 @@
+RocketHideoutB2F_h:
+	db FACILITY ; tileset
+	db ROCKET_HIDEOUT_B2F_HEIGHT, ROCKET_HIDEOUT_B2F_WIDTH ; dimensions (y, x)
+	dw RocketHideoutB2F_Blocks ; blocks
+	dw RocketHideoutB2F_TextPointers ; texts
+	dw RocketHideoutB2F_Script ; scripts
+	db 0 ; connections
+	dw RocketHideoutB2F_Object ; objects
diff --git a/data/mapHeaders/RocketHideoutB3F.asm b/data/mapHeaders/RocketHideoutB3F.asm
new file mode 100755
index 00000000..7eab257e
--- /dev/null
+++ b/data/mapHeaders/RocketHideoutB3F.asm
@@ -0,0 +1,8 @@
+RocketHideoutB3F_h:
+	db FACILITY ; tileset
+	db ROCKET_HIDEOUT_B3F_HEIGHT, ROCKET_HIDEOUT_B3F_WIDTH ; dimensions (y, x)
+	dw RocketHideoutB3F_Blocks ; blocks
+	dw RocketHideoutB3F_TextPointers ; texts
+	dw RocketHideoutB3F_Script ; scripts
+	db 0 ; connections
+	dw RocketHideoutB3F_Object ; objects
diff --git a/data/mapHeaders/RocketHideoutB4F.asm b/data/mapHeaders/RocketHideoutB4F.asm
new file mode 100755
index 00000000..57797c56
--- /dev/null
+++ b/data/mapHeaders/RocketHideoutB4F.asm
@@ -0,0 +1,8 @@
+RocketHideoutB4F_h:
+	db FACILITY ; tileset
+	db ROCKET_HIDEOUT_B4F_HEIGHT, ROCKET_HIDEOUT_B4F_WIDTH ; dimensions (y, x)
+	dw RocketHideoutB4F_Blocks ; blocks
+	dw RocketHideoutB4F_TextPointers ; texts
+	dw RocketHideoutB4F_Script ; scripts
+	db 0 ; connections
+	dw RocketHideoutB4F_Object ; objects
diff --git a/data/mapHeaders/RocketHideoutElevator.asm b/data/mapHeaders/RocketHideoutElevator.asm
new file mode 100755
index 00000000..742d0038
--- /dev/null
+++ b/data/mapHeaders/RocketHideoutElevator.asm
@@ -0,0 +1,8 @@
+RocketHideoutElevator_h:
+	db LOBBY ; tileset
+	db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x)
+	dw RocketHideoutElevator_Blocks ; blocks
+	dw RocketHideoutElevator_TextPointers ; texts
+	dw RocketHideoutElevator_Script ; scripts
+	db 0 ; connections
+	dw RocketHideoutElevator_Object ; objects
diff --git a/data/mapHeaders/Route1.asm b/data/mapHeaders/Route1.asm
new file mode 100755
index 00000000..ce460937
--- /dev/null
+++ b/data/mapHeaders/Route1.asm
@@ -0,0 +1,10 @@
+Route1_h:
+	db OVERWORLD ; tileset
+	db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x)
+	dw Route1_Blocks ; blocks
+	dw Route1_TextPointers ; texts
+	dw Route1_Script ; scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION ROUTE_1, VIRIDIAN_CITY, -3, 2, ViridianCity_Blocks
+	SOUTH_MAP_CONNECTION ROUTE_1, PALLET_TOWN, 0, 0, PalletTown_Blocks, 1
+	dw Route1_Object ; objects
diff --git a/data/mapHeaders/Route10.asm b/data/mapHeaders/Route10.asm
new file mode 100755
index 00000000..8c51bfc6
--- /dev/null
+++ b/data/mapHeaders/Route10.asm
@@ -0,0 +1,10 @@
+Route10_h:
+	db OVERWORLD ; tileset
+	db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x)
+	dw Route10_Blocks ; blocks
+	dw Route10_TextPointers ; texts
+	dw Route10_Script ; scripts
+	db SOUTH | WEST ; connections
+	SOUTH_MAP_CONNECTION ROUTE_10, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks
+	WEST_MAP_CONNECTION ROUTE_10, ROUTE_9, 0, 0, Route9_Blocks
+	dw Route10_Object ; objects
diff --git a/data/mapHeaders/Route11.asm b/data/mapHeaders/Route11.asm
new file mode 100755
index 00000000..b7814465
--- /dev/null
+++ b/data/mapHeaders/Route11.asm
@@ -0,0 +1,10 @@
+Route11_h:
+	db OVERWORLD ; tileset
+	db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x)
+	dw Route11_Blocks ; blocks
+	dw Route11_TextPointers ; texts
+	dw Route11_Script ; scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION ROUTE_11, VERMILION_CITY, -3, 1, VermilionCity_Blocks
+	EAST_MAP_CONNECTION ROUTE_11, ROUTE_12, -3, 24, Route12_Blocks, 1
+	dw Route11_Object ; objects
diff --git a/data/mapHeaders/Route11Gate1F.asm b/data/mapHeaders/Route11Gate1F.asm
new file mode 100755
index 00000000..2e01d168
--- /dev/null
+++ b/data/mapHeaders/Route11Gate1F.asm
@@ -0,0 +1,8 @@
+Route11Gate1F_h:
+	db GATE ; tileset
+	db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x)
+	dw Route11Gate1F_Blocks ; blocks
+	dw Route11Gate1F_TextPointers ; texts
+	dw Route11Gate1F_Script ; scripts
+	db 0 ; connections
+	dw Route11Gate1F_Object ; objects
diff --git a/data/mapHeaders/Route11Gate2F.asm b/data/mapHeaders/Route11Gate2F.asm
new file mode 100755
index 00000000..ecb2ab7c
--- /dev/null
+++ b/data/mapHeaders/Route11Gate2F.asm
@@ -0,0 +1,8 @@
+Route11Gate2F_h:
+	db GATE ; tileset
+	db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x)
+	dw Route11Gate2F_Blocks ; blocks
+	dw Route11Gate2F_TextPointers ; texts
+	dw Route11Gate2F_Script ; scripts
+	db 0 ; connections
+	dw Route11Gate2F_Object ; objects
diff --git a/data/mapHeaders/Route12.asm b/data/mapHeaders/Route12.asm
new file mode 100755
index 00000000..2f76aa27
--- /dev/null
+++ b/data/mapHeaders/Route12.asm
@@ -0,0 +1,11 @@
+Route12_h:
+	db OVERWORLD ; tileset
+	db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x)
+	dw Route12_Blocks ; blocks
+	dw Route12_TextPointers ; texts
+	dw Route12_Script ; scripts
+	db NORTH | SOUTH | WEST ; connections
+	NORTH_MAP_CONNECTION ROUTE_12, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks
+	SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_13, -3, 17, Route13_Blocks
+	WEST_MAP_CONNECTION ROUTE_12, ROUTE_11, 27, 0, Route11_Blocks
+	dw Route12_Object ; objects
diff --git a/data/mapHeaders/Route12Gate1F.asm b/data/mapHeaders/Route12Gate1F.asm
new file mode 100755
index 00000000..e44aecab
--- /dev/null
+++ b/data/mapHeaders/Route12Gate1F.asm
@@ -0,0 +1,8 @@
+Route12Gate1F_h:
+	db GATE ; tileset
+	db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x)
+	dw Route12Gate1F_Blocks ; blocks
+	dw Route12Gate1F_TextPointers ; texts
+	dw Route12Gate1F_Script ; scripts
+	db 0 ; connections
+	dw Route12Gate1F_Object ; objects
diff --git a/data/mapHeaders/Route12Gate2F.asm b/data/mapHeaders/Route12Gate2F.asm
new file mode 100755
index 00000000..94d5d54c
--- /dev/null
+++ b/data/mapHeaders/Route12Gate2F.asm
@@ -0,0 +1,8 @@
+Route12Gate2F_h:
+	db GATE ; tileset
+	db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x)
+	dw Route12Gate2F_Blocks ; blocks
+	dw Route12Gate2F_TextPointers ; texts
+	dw Route12Gate2F_Script ; scripts
+	db 0 ; connections
+	dw Route12Gate2F_Object ; objects
diff --git a/data/mapHeaders/Route12SuperRodHouse.asm b/data/mapHeaders/Route12SuperRodHouse.asm
new file mode 100755
index 00000000..ef5e0f2c
--- /dev/null
+++ b/data/mapHeaders/Route12SuperRodHouse.asm
@@ -0,0 +1,8 @@
+Route12SuperRodHouse_h:
+	db HOUSE ; tileset
+	db ROUTE_12_SUPER_ROD_HOUSE_HEIGHT, ROUTE_12_SUPER_ROD_HOUSE_WIDTH ; dimensions (y, x)
+	dw Route12SuperRodHouse_Blocks ; blocks
+	dw Route12SuperRodHouse_TextPointers ; texts
+	dw Route12SuperRodHouse_Script ; scripts
+	db 0 ; connections
+	dw Route12SuperRodHouse_Object ; objects
diff --git a/data/mapHeaders/Route13.asm b/data/mapHeaders/Route13.asm
new file mode 100755
index 00000000..e6e244b9
--- /dev/null
+++ b/data/mapHeaders/Route13.asm
@@ -0,0 +1,10 @@
+Route13_h:
+	db OVERWORLD ; tileset
+	db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x)
+	dw Route13_Blocks ; blocks
+	dw Route13_TextPointers ; texts
+	dw Route13_Script ; scripts
+	db NORTH | WEST ; connections
+	NORTH_MAP_CONNECTION ROUTE_13, ROUTE_12, 20, 0, Route12_Blocks
+	WEST_MAP_CONNECTION ROUTE_13, ROUTE_14, 0, 0, Route14_Blocks
+	dw Route13_Object ; objects
diff --git a/data/mapHeaders/Route14.asm b/data/mapHeaders/Route14.asm
new file mode 100755
index 00000000..c3934ac5
--- /dev/null
+++ b/data/mapHeaders/Route14.asm
@@ -0,0 +1,10 @@
+Route14_h:
+	db OVERWORLD ; tileset
+	db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x)
+	dw Route14_Blocks ; blocks
+	dw Route14_TextPointers ; texts
+	dw Route14_Script ; scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION ROUTE_14, ROUTE_15, 18, 0, Route15_Blocks
+	EAST_MAP_CONNECTION ROUTE_14, ROUTE_13, 0, 0, Route13_Blocks
+	dw Route14_Object ; objects
diff --git a/data/mapHeaders/Route15.asm b/data/mapHeaders/Route15.asm
new file mode 100755
index 00000000..eb14d750
--- /dev/null
+++ b/data/mapHeaders/Route15.asm
@@ -0,0 +1,10 @@
+Route15_h:
+	db OVERWORLD ; tileset
+	db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x)
+	dw Route15_Blocks ; blocks
+	dw Route15_TextPointers ; texts
+	dw Route15_Script ; scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION ROUTE_15, FUCHSIA_CITY, -3, 1, FuchsiaCity_Blocks
+	EAST_MAP_CONNECTION ROUTE_15, ROUTE_14, -3, 15, Route14_Blocks
+	dw Route15_Object ; objects
diff --git a/data/mapHeaders/Route15Gate1F.asm b/data/mapHeaders/Route15Gate1F.asm
new file mode 100755
index 00000000..b1ae5662
--- /dev/null
+++ b/data/mapHeaders/Route15Gate1F.asm
@@ -0,0 +1,8 @@
+Route15Gate1F_h:
+	db GATE ; tileset
+	db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x)
+	dw Route15Gate1F_Blocks ; blocks
+	dw Route15Gate1F_TextPointers ; texts
+	dw Route15Gate1F_Script ; scripts
+	db 0 ; connections
+	dw Route15Gate1F_Object ; objects
diff --git a/data/mapHeaders/Route15Gate2F.asm b/data/mapHeaders/Route15Gate2F.asm
new file mode 100755
index 00000000..501da092
--- /dev/null
+++ b/data/mapHeaders/Route15Gate2F.asm
@@ -0,0 +1,8 @@
+Route15Gate2F_h:
+	db GATE ; tileset
+	db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x)
+	dw Route15Gate2F_Blocks ; blocks
+	dw Route15Gate2F_TextPointers ; texts
+	dw Route15Gate2F_Script ; scripts
+	db 0 ; connections
+	dw Route15Gate2F_Object ; objects
diff --git a/data/mapHeaders/Route16.asm b/data/mapHeaders/Route16.asm
new file mode 100755
index 00000000..d12b6ea9
--- /dev/null
+++ b/data/mapHeaders/Route16.asm
@@ -0,0 +1,10 @@
+Route16_h:
+	db OVERWORLD ; tileset
+	db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x)
+	dw Route16_Blocks ; blocks
+	dw Route16_TextPointers ; texts
+	dw Route16_Script ; scripts
+	db SOUTH | EAST ; connections
+	SOUTH_MAP_CONNECTION ROUTE_16, ROUTE_17, 0, 0, Route17_Blocks
+	EAST_MAP_CONNECTION ROUTE_16, CELADON_CITY, -3, 1, CeladonCity_Blocks, 1
+	dw Route16_Object ; objects
diff --git a/data/mapHeaders/Route16FlyHouse.asm b/data/mapHeaders/Route16FlyHouse.asm
new file mode 100755
index 00000000..0d3f828d
--- /dev/null
+++ b/data/mapHeaders/Route16FlyHouse.asm
@@ -0,0 +1,8 @@
+Route16FlyHouse_h:
+	db HOUSE ; tileset
+	db ROUTE_16_FLY_HOUSE_HEIGHT, ROUTE_16_FLY_HOUSE_WIDTH ; dimensions (y, x)
+	dw Route16FlyHouse_Blocks ; blocks
+	dw Route16FlyHouse_TextPointers ; texts
+	dw Route16FlyHouse_Script ; scripts
+	db 0 ; connections
+	dw Route16FlyHouse_Object ; objects
diff --git a/data/mapHeaders/Route16Gate1F.asm b/data/mapHeaders/Route16Gate1F.asm
new file mode 100755
index 00000000..561fb597
--- /dev/null
+++ b/data/mapHeaders/Route16Gate1F.asm
@@ -0,0 +1,8 @@
+Route16Gate1F_h:
+	db GATE ; tileset
+	db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x)
+	dw Route16Gate1F_Blocks ; blocks
+	dw Route16Gate1F_TextPointers ; texts
+	dw Route16Gate1F_Script ; scripts
+	db 0 ; connections
+	dw Route16Gate1F_Object ; objects
diff --git a/data/mapHeaders/Route16Gate2F.asm b/data/mapHeaders/Route16Gate2F.asm
new file mode 100755
index 00000000..90783ab7
--- /dev/null
+++ b/data/mapHeaders/Route16Gate2F.asm
@@ -0,0 +1,8 @@
+Route16Gate2F_h:
+	db GATE ; tileset
+	db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x)
+	dw Route16Gate2F_Blocks ; blocks
+	dw Route16Gate2F_TextPointers ; texts
+	dw Route16Gate2F_Script ; scripts
+	db 0 ; connections
+	dw Route16Gate2F_Object ; objects
diff --git a/data/mapHeaders/Route17.asm b/data/mapHeaders/Route17.asm
new file mode 100755
index 00000000..58a785b4
--- /dev/null
+++ b/data/mapHeaders/Route17.asm
@@ -0,0 +1,10 @@
+Route17_h:
+	db OVERWORLD ; tileset
+	db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x)
+	dw Route17_Blocks ; blocks
+	dw Route17_TextPointers ; texts
+	dw Route17_Script ; scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION ROUTE_17, ROUTE_16, 0, 0, Route16_Blocks
+	SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_18, 0, 0, Route18_Blocks, 1
+	dw Route17_Object ; objects
diff --git a/data/mapHeaders/Route18.asm b/data/mapHeaders/Route18.asm
new file mode 100755
index 00000000..5e10bdbd
--- /dev/null
+++ b/data/mapHeaders/Route18.asm
@@ -0,0 +1,10 @@
+Route18_h:
+	db OVERWORLD ; tileset
+	db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x)
+	dw Route18_Blocks ; blocks
+	dw Route18_TextPointers ; texts
+	dw Route18_Script ; scripts
+	db NORTH | EAST ; connections
+	NORTH_MAP_CONNECTION ROUTE_18, ROUTE_17, 0, 0, Route17_Blocks
+	EAST_MAP_CONNECTION ROUTE_18, FUCHSIA_CITY, -3, 1, FuchsiaCity_Blocks, 1
+	dw Route18_Object ; objects
diff --git a/data/mapHeaders/Route18Gate1F.asm b/data/mapHeaders/Route18Gate1F.asm
new file mode 100755
index 00000000..0e4a0dc3
--- /dev/null
+++ b/data/mapHeaders/Route18Gate1F.asm
@@ -0,0 +1,8 @@
+Route18Gate1F_h:
+	db GATE ; tileset
+	db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x)
+	dw Route18Gate1F_Blocks ; blocks
+	dw Route18Gate1F_TextPointers ; texts
+	dw Route18Gate1F_Script ; scripts
+	db 0 ; connections
+	dw Route18Gate1F_Object ; objects
diff --git a/data/mapHeaders/Route18Gate2F.asm b/data/mapHeaders/Route18Gate2F.asm
new file mode 100755
index 00000000..5d8f7126
--- /dev/null
+++ b/data/mapHeaders/Route18Gate2F.asm
@@ -0,0 +1,8 @@
+Route18Gate2F_h:
+	db GATE ; tileset
+	db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x)
+	dw Route18Gate2F_Blocks ; blocks
+	dw Route18Gate2F_TextPointers ; texts
+	dw Route18Gate2F_Script ; scripts
+	db 0 ; connections
+	dw Route18Gate2F_Object ; objects
diff --git a/data/mapHeaders/Route19.asm b/data/mapHeaders/Route19.asm
new file mode 100755
index 00000000..79972677
--- /dev/null
+++ b/data/mapHeaders/Route19.asm
@@ -0,0 +1,10 @@
+Route19_h:
+	db OVERWORLD ; tileset
+	db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x)
+	dw Route19_Blocks ; blocks
+	dw Route19_TextPointers ; texts
+	dw Route19_Script ; scripts
+	db NORTH | WEST ; connections
+	NORTH_MAP_CONNECTION ROUTE_19, FUCHSIA_CITY, -3, 2, FuchsiaCity_Blocks
+	WEST_MAP_CONNECTION ROUTE_19, ROUTE_20, 18, 0, Route20_Blocks
+	dw Route19_Object ; objects
diff --git a/data/mapHeaders/Route2.asm b/data/mapHeaders/Route2.asm
new file mode 100755
index 00000000..94511d06
--- /dev/null
+++ b/data/mapHeaders/Route2.asm
@@ -0,0 +1,10 @@
+Route2_h:
+	db OVERWORLD ; tileset
+	db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x)
+	dw Route2_Blocks ; blocks
+	dw Route2_TextPointers ; texts
+	dw Route2_Script ; scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCity_Blocks
+	SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCity_Blocks, 1
+	dw Route2_Object ; objects
diff --git a/data/mapHeaders/Route20.asm b/data/mapHeaders/Route20.asm
new file mode 100755
index 00000000..689f51cd
--- /dev/null
+++ b/data/mapHeaders/Route20.asm
@@ -0,0 +1,10 @@
+Route20_h:
+	db OVERWORLD ; tileset
+	db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x)
+	dw Route20_Blocks ; blocks
+	dw Route20_TextPointers ; texts
+	dw Route20_Script ; scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION ROUTE_20, CINNABAR_ISLAND, 0, 0, CinnabarIsland_Blocks
+	EAST_MAP_CONNECTION ROUTE_20, ROUTE_19, -3, 15, Route19_Blocks
+	dw Route20_Object ; objects
diff --git a/data/mapHeaders/Route21.asm b/data/mapHeaders/Route21.asm
new file mode 100755
index 00000000..f37869dc
--- /dev/null
+++ b/data/mapHeaders/Route21.asm
@@ -0,0 +1,10 @@
+Route21_h:
+	db OVERWORLD ; tileset
+	db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x)
+	dw Route21_Blocks ; blocks
+	dw Route21_TextPointers ; texts
+	dw Route21_Script ; scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION ROUTE_21, PALLET_TOWN, 0, 0, PalletTown_Blocks
+	SOUTH_MAP_CONNECTION ROUTE_21, CINNABAR_ISLAND, 0, 0, CinnabarIsland_Blocks, 1
+	dw Route21_Object ; objects
diff --git a/data/mapHeaders/Route22.asm b/data/mapHeaders/Route22.asm
new file mode 100755
index 00000000..4d07475f
--- /dev/null
+++ b/data/mapHeaders/Route22.asm
@@ -0,0 +1,10 @@
+Route22_h:
+	db OVERWORLD ; tileset
+	db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x)
+	dw Route22_Blocks ; blocks
+	dw Route22_TextPointers ; texts
+	dw Route22_Script ; scripts
+	db NORTH | EAST ; connections
+	NORTH_MAP_CONNECTION ROUTE_22, ROUTE_23, 0, 0, Route23_Blocks
+	EAST_MAP_CONNECTION ROUTE_22, VIRIDIAN_CITY, -3, 1, ViridianCity_Blocks, 1
+	dw Route22_Object ; objects
diff --git a/data/mapHeaders/Route22Gate.asm b/data/mapHeaders/Route22Gate.asm
new file mode 100755
index 00000000..4d3ae0cc
--- /dev/null
+++ b/data/mapHeaders/Route22Gate.asm
@@ -0,0 +1,8 @@
+Route22Gate_h:
+	db GATE ; tileset
+	db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x)
+	dw Route22Gate_Blocks ; blocks
+	dw Route22Gate_TextPointers ; texts
+	dw Route22Gate_Script ; scripts
+	db 0 ; connections
+	dw Route22Gate_Object ; objects
diff --git a/data/mapHeaders/Route23.asm b/data/mapHeaders/Route23.asm
new file mode 100755
index 00000000..6b1fde97
--- /dev/null
+++ b/data/mapHeaders/Route23.asm
@@ -0,0 +1,10 @@
+Route23_h:
+	db PLATEAU ; tileset
+	db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x)
+	dw Route23_Blocks ; blocks
+	dw Route23_TextPointers ; texts
+	dw Route23_Script ; scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION ROUTE_23, INDIGO_PLATEAU, 0, 0, IndigoPlateau_Blocks
+	SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_22, 0, 0, Route22_Blocks, 1
+	dw Route23_Object ; objects
diff --git a/data/mapHeaders/Route24.asm b/data/mapHeaders/Route24.asm
new file mode 100755
index 00000000..87776f60
--- /dev/null
+++ b/data/mapHeaders/Route24.asm
@@ -0,0 +1,10 @@
+Route24_h:
+	db OVERWORLD ; tileset
+	db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x)
+	dw Route24_Blocks ; blocks
+	dw Route24_TextPointers ; texts
+	dw Route24_Script ; scripts
+	db SOUTH | EAST ; connections
+	SOUTH_MAP_CONNECTION ROUTE_24, CERULEAN_CITY, -3, 2, CeruleanCity_Blocks, 1
+	EAST_MAP_CONNECTION ROUTE_24, ROUTE_25, 0, 0, Route25_Blocks
+	dw Route24_Object ; objects
diff --git a/data/mapHeaders/Route25.asm b/data/mapHeaders/Route25.asm
new file mode 100755
index 00000000..c300eeb3
--- /dev/null
+++ b/data/mapHeaders/Route25.asm
@@ -0,0 +1,9 @@
+Route25_h:
+	db OVERWORLD ; tileset
+	db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x)
+	dw Route25_Blocks ; blocks
+	dw Route25_TextPointers ; texts
+	dw Route25_Script ; scripts
+	db WEST ; connections
+	WEST_MAP_CONNECTION ROUTE_25, ROUTE_24, 0, 0, Route24_Blocks
+	dw Route25_Object ; objects
diff --git a/data/mapHeaders/Route2Gate.asm b/data/mapHeaders/Route2Gate.asm
new file mode 100755
index 00000000..9b284178
--- /dev/null
+++ b/data/mapHeaders/Route2Gate.asm
@@ -0,0 +1,8 @@
+Route2Gate_h:
+	db GATE ; tileset
+	db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x)
+	dw Route2Gate_Blocks ; blocks
+	dw Route2Gate_TextPointers ; texts
+	dw Route2Gate_Script ; scripts
+	db 0 ; connections
+	dw Route2Gate_Object ; objects
diff --git a/data/mapHeaders/Route2TradeHouse.asm b/data/mapHeaders/Route2TradeHouse.asm
new file mode 100755
index 00000000..33693943
--- /dev/null
+++ b/data/mapHeaders/Route2TradeHouse.asm
@@ -0,0 +1,8 @@
+Route2TradeHouse_h:
+	db HOUSE ; tileset
+	db ROUTE_2_TRADE_HOUSE_HEIGHT, ROUTE_2_TRADE_HOUSE_WIDTH ; dimensions (y, x)
+	dw Route2TradeHouse_Blocks ; blocks
+	dw Route2TradeHouse_TextPointers ; texts
+	dw Route2TradeHouse_Script ; scripts
+	db 0 ; connections
+	dw Route2TradeHouse_Object ; objects
diff --git a/data/mapHeaders/Route3.asm b/data/mapHeaders/Route3.asm
new file mode 100755
index 00000000..c611e4b8
--- /dev/null
+++ b/data/mapHeaders/Route3.asm
@@ -0,0 +1,10 @@
+Route3_h:
+	db OVERWORLD ; tileset
+	db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x)
+	dw Route3_Blocks ; blocks
+	dw Route3_TextPointers ; texts
+	dw Route3_Script ; scripts
+	db NORTH | WEST ; connections
+	NORTH_MAP_CONNECTION ROUTE_3, ROUTE_4, 25, 0, Route4_Blocks
+	WEST_MAP_CONNECTION ROUTE_3, PEWTER_CITY, -3, 1, PewterCity_Blocks
+	dw Route3_Object ; objects
diff --git a/data/mapHeaders/Route4.asm b/data/mapHeaders/Route4.asm
new file mode 100755
index 00000000..999a1207
--- /dev/null
+++ b/data/mapHeaders/Route4.asm
@@ -0,0 +1,10 @@
+Route4_h:
+	db OVERWORLD ; tileset
+	db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x)
+	dw Route4_Blocks ; blocks
+	dw Route4_TextPointers ; texts
+	dw Route4_Script ; scripts
+	db SOUTH | EAST ; connections
+	SOUTH_MAP_CONNECTION ROUTE_4, ROUTE_3, -3, 22, Route3_Blocks
+	EAST_MAP_CONNECTION ROUTE_4, CERULEAN_CITY, -3, 1, CeruleanCity_Blocks, 1
+	dw Route4_Object ; objects
diff --git a/data/mapHeaders/Route5.asm b/data/mapHeaders/Route5.asm
new file mode 100755
index 00000000..6480aebd
--- /dev/null
+++ b/data/mapHeaders/Route5.asm
@@ -0,0 +1,10 @@
+Route5_h:
+	db OVERWORLD ; tileset
+	db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x)
+	dw Route5_Blocks ; blocks
+	dw Route5_TextPointers ; texts
+	dw Route5_Script ; scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION ROUTE_5, CERULEAN_CITY, -3, 2, CeruleanCity_Blocks
+	SOUTH_MAP_CONNECTION ROUTE_5, SAFFRON_CITY, -3, 2, SaffronCity_Blocks, 1
+	dw Route5_Object ; objects
diff --git a/data/mapHeaders/Route5Gate.asm b/data/mapHeaders/Route5Gate.asm
new file mode 100755
index 00000000..bb418182
--- /dev/null
+++ b/data/mapHeaders/Route5Gate.asm
@@ -0,0 +1,8 @@
+Route5Gate_h:
+	db GATE ; tileset
+	db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x)
+	dw Route5Gate_Blocks ; blocks
+	dw Route5Gate_TextPointers ; texts
+	dw Route5Gate_Script ; scripts
+	db 0 ; connections
+	dw Route5Gate_Object ; objects
diff --git a/data/mapHeaders/Route6.asm b/data/mapHeaders/Route6.asm
new file mode 100755
index 00000000..9385ce5f
--- /dev/null
+++ b/data/mapHeaders/Route6.asm
@@ -0,0 +1,10 @@
+Route6_h:
+	db OVERWORLD ; tileset
+	db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x)
+	dw Route6_Blocks ; blocks
+	dw Route6_TextPointers ; texts
+	dw Route6_Script ; scripts
+	db NORTH | SOUTH ; connections
+	NORTH_MAP_CONNECTION ROUTE_6, SAFFRON_CITY, -3, 2, SaffronCity_Blocks
+	SOUTH_MAP_CONNECTION ROUTE_6, VERMILION_CITY, -3, 2, VermilionCity_Blocks, 1
+	dw Route6_Object ; objects
diff --git a/data/mapHeaders/Route6Gate.asm b/data/mapHeaders/Route6Gate.asm
new file mode 100755
index 00000000..282cc5b6
--- /dev/null
+++ b/data/mapHeaders/Route6Gate.asm
@@ -0,0 +1,8 @@
+Route6Gate_h:
+	db GATE ; tileset
+	db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x)
+	dw Route6Gate_Blocks ; blocks
+	dw Route6Gate_TextPointers ; texts
+	dw Route6Gate_Script ; scripts
+	db 0 ; connections
+	dw Route6Gate_Object ; objects
diff --git a/data/mapHeaders/Route7.asm b/data/mapHeaders/Route7.asm
new file mode 100755
index 00000000..9b34ea1f
--- /dev/null
+++ b/data/mapHeaders/Route7.asm
@@ -0,0 +1,10 @@
+Route7_h:
+	db OVERWORLD ; tileset
+	db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x)
+	dw Route7_Blocks ; blocks
+	dw Route7_TextPointers ; texts
+	dw Route7_Script ; scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION ROUTE_7, CELADON_CITY, -3, 1, CeladonCity_Blocks
+	EAST_MAP_CONNECTION ROUTE_7, SAFFRON_CITY, -3, 1, SaffronCity_Blocks, 1
+	dw Route7_Object ; objects
diff --git a/data/mapHeaders/Route7Gate.asm b/data/mapHeaders/Route7Gate.asm
new file mode 100755
index 00000000..61771e42
--- /dev/null
+++ b/data/mapHeaders/Route7Gate.asm
@@ -0,0 +1,8 @@
+Route7Gate_h:
+	db GATE ; tileset
+	db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x)
+	dw Route7Gate_Blocks ; blocks
+	dw Route7Gate_TextPointers ; texts
+	dw Route7Gate_Script ; scripts
+	db 0 ; connections
+	dw Route7Gate_Object ; objects
diff --git a/data/mapHeaders/Route8.asm b/data/mapHeaders/Route8.asm
new file mode 100755
index 00000000..bd2ee71e
--- /dev/null
+++ b/data/mapHeaders/Route8.asm
@@ -0,0 +1,10 @@
+Route8_h:
+	db OVERWORLD ; tileset
+	db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x)
+	dw Route8_Blocks ; blocks
+	dw Route8_TextPointers ; texts
+	dw Route8_Script ; scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION ROUTE_8, SAFFRON_CITY, -3, 1, SaffronCity_Blocks
+	EAST_MAP_CONNECTION ROUTE_8, LAVENDER_TOWN, 0, 0, LavenderTown_Blocks
+	dw Route8_Object ; objects
diff --git a/data/mapHeaders/Route8Gate.asm b/data/mapHeaders/Route8Gate.asm
new file mode 100755
index 00000000..dd14a237
--- /dev/null
+++ b/data/mapHeaders/Route8Gate.asm
@@ -0,0 +1,8 @@
+Route8Gate_h:
+	db GATE ; tileset
+	db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x)
+	dw Route8Gate_Blocks ; blocks
+	dw Route8Gate_TextPointers ; texts
+	dw Route8Gate_Script ; scripts
+	db 0 ; connections
+	dw Route8Gate_Object ; objects
diff --git a/data/mapHeaders/Route9.asm b/data/mapHeaders/Route9.asm
new file mode 100755
index 00000000..3dec3b0a
--- /dev/null
+++ b/data/mapHeaders/Route9.asm
@@ -0,0 +1,10 @@
+Route9_h:
+	db OVERWORLD ; tileset
+	db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x)
+	dw Route9_Blocks ; blocks
+	dw Route9_TextPointers ; texts
+	dw Route9_Script ; scripts
+	db WEST | EAST ; connections
+	WEST_MAP_CONNECTION ROUTE_9, CERULEAN_CITY, -3, 1, CeruleanCity_Blocks
+	EAST_MAP_CONNECTION ROUTE_9, ROUTE_10, 0, 0, Route10_Blocks, 1
+	dw Route9_Object ; objects
diff --git a/data/mapHeaders/SSAnne1F.asm b/data/mapHeaders/SSAnne1F.asm
new file mode 100755
index 00000000..a69423d6
--- /dev/null
+++ b/data/mapHeaders/SSAnne1F.asm
@@ -0,0 +1,8 @@
+SSAnne1F_h:
+	db SHIP ; tileset
+	db SS_ANNE_1F_HEIGHT, SS_ANNE_1F_WIDTH ; dimensions (y, x)
+	dw SSAnne1F_Blocks ; blocks
+	dw SSAnne1F_TextPointers ; texts
+	dw SSAnne1F_Script ; scripts
+	db 0 ; connections
+	dw SSAnne1F_Object ; objects
diff --git a/data/mapHeaders/SSAnne1FRooms.asm b/data/mapHeaders/SSAnne1FRooms.asm
new file mode 100755
index 00000000..1f8af23d
--- /dev/null
+++ b/data/mapHeaders/SSAnne1FRooms.asm
@@ -0,0 +1,8 @@
+SSAnne1FRooms_h:
+	db SHIP ; tileset
+	db SS_ANNE_1F_ROOMS_HEIGHT, SS_ANNE_1F_ROOMS_WIDTH ; dimensions (y, x)
+	dw SSAnne1FRooms_Blocks ; blocks
+	dw SSAnne1FRooms_TextPointers ; texts
+	dw SSAnne1FRooms_Script ; scripts
+	db 0 ; connections
+	dw SSAnne1FRooms_Object ; objects
diff --git a/data/mapHeaders/SSAnne2F.asm b/data/mapHeaders/SSAnne2F.asm
new file mode 100755
index 00000000..d42d16f4
--- /dev/null
+++ b/data/mapHeaders/SSAnne2F.asm
@@ -0,0 +1,8 @@
+SSAnne2F_h:
+	db SHIP ; tileset
+	db SS_ANNE_2F_HEIGHT, SS_ANNE_2F_WIDTH ; dimensions (y, x)
+	dw SSAnne2F_Blocks ; blocks
+	dw SSAnne2F_TextPointers ; texts
+	dw SSAnne2F_Script ; scripts
+	db 0 ; connections
+	dw SSAnne2F_Object ; objects
diff --git a/data/mapHeaders/SSAnne2FRooms.asm b/data/mapHeaders/SSAnne2FRooms.asm
new file mode 100755
index 00000000..f22de0fa
--- /dev/null
+++ b/data/mapHeaders/SSAnne2FRooms.asm
@@ -0,0 +1,8 @@
+SSAnne2FRooms_h:
+	db SHIP ; tileset
+	db SS_ANNE_2F_ROOMS_HEIGHT, SS_ANNE_2F_ROOMS_WIDTH ; dimensions (y, x)
+	dw SSAnne2FRooms_Blocks ; blocks
+	dw SSAnne2FRooms_TextPointers ; texts
+	dw SSAnne2FRooms_Script ; scripts
+	db 0 ; connections
+	dw SSAnne2FRooms_Object ; objects
diff --git a/data/mapHeaders/SSAnne3F.asm b/data/mapHeaders/SSAnne3F.asm
new file mode 100755
index 00000000..1c5dafea
--- /dev/null
+++ b/data/mapHeaders/SSAnne3F.asm
@@ -0,0 +1,8 @@
+SSAnne3F_h:
+	db SHIP ; tileset
+	db SS_ANNE_3F_HEIGHT, SS_ANNE_3F_WIDTH ; dimensions (y, x)
+	dw SSAnne3F_Blocks ; blocks
+	dw SSAnne3F_TextPointers ; texts
+	dw SSAnne3F_Script ; scripts
+	db 0 ; connections
+	dw SSAnne3F_Object ; objects
diff --git a/data/mapHeaders/SSAnneB1F.asm b/data/mapHeaders/SSAnneB1F.asm
new file mode 100755
index 00000000..a3ca6dfa
--- /dev/null
+++ b/data/mapHeaders/SSAnneB1F.asm
@@ -0,0 +1,8 @@
+SSAnneB1F_h:
+	db SHIP ; tileset
+	db SS_ANNE_B1F_HEIGHT, SS_ANNE_B1F_WIDTH ; dimensions (y, x)
+	dw SSAnneB1F_Blocks ; blocks
+	dw SSAnneB1F_TextPointers ; texts
+	dw SSAnneB1F_Script ; scripts
+	db 0 ; connections
+	dw SSAnneB1F_Object ; objects
diff --git a/data/mapHeaders/SSAnneB1FRooms.asm b/data/mapHeaders/SSAnneB1FRooms.asm
new file mode 100755
index 00000000..f08e343b
--- /dev/null
+++ b/data/mapHeaders/SSAnneB1FRooms.asm
@@ -0,0 +1,8 @@
+SSAnneB1FRooms_h:
+	db SHIP ; tileset
+	db SS_ANNE_B1F_ROOMS_HEIGHT, SS_ANNE_B1F_ROOMS_WIDTH ; dimensions (y, x)
+	dw SSAnneB1FRooms_Blocks ; blocks
+	dw SSAnneB1FRooms_TextPointers ; texts
+	dw SSAnneB1FRooms_Script ; scripts
+	db 0 ; connections
+	dw SSAnneB1FRooms_Object ; objects
diff --git a/data/mapHeaders/SSAnneBow.asm b/data/mapHeaders/SSAnneBow.asm
new file mode 100755
index 00000000..baa71147
--- /dev/null
+++ b/data/mapHeaders/SSAnneBow.asm
@@ -0,0 +1,8 @@
+SSAnneBow_h:
+	db SHIP ; tileset
+	db SS_ANNE_BOW_HEIGHT, SS_ANNE_BOW_WIDTH ; dimensions (y, x)
+	dw SSAnneBow_Blocks ; blocks
+	dw SSAnneBow_TextPointers ; texts
+	dw SSAnneBow_Script ; scripts
+	db 0 ; connections
+	dw SSAnneBow_Object ; objects
diff --git a/data/mapHeaders/SSAnneCaptainsRoom.asm b/data/mapHeaders/SSAnneCaptainsRoom.asm
new file mode 100755
index 00000000..433f060a
--- /dev/null
+++ b/data/mapHeaders/SSAnneCaptainsRoom.asm
@@ -0,0 +1,8 @@
+SSAnneCaptainsRoom_h:
+	db SHIP ; tileset
+	db SS_ANNE_CAPTAINS_ROOM_HEIGHT, SS_ANNE_CAPTAINS_ROOM_WIDTH ; dimensions (y, x)
+	dw SSAnneCaptainsRoom_Blocks ; blocks
+	dw SSAnneCaptainsRoom_TextPointers ; texts
+	dw SSAnneCaptainsRoom_Script ; scripts
+	db 0 ; connections
+	dw SSAnneCaptainsRoom_Object ; objects
diff --git a/data/mapHeaders/SSAnneKitchen.asm b/data/mapHeaders/SSAnneKitchen.asm
new file mode 100755
index 00000000..eacbbfb8
--- /dev/null
+++ b/data/mapHeaders/SSAnneKitchen.asm
@@ -0,0 +1,8 @@
+SSAnneKitchen_h:
+	db SHIP ; tileset
+	db SS_ANNE_KITCHEN_HEIGHT, SS_ANNE_KITCHEN_WIDTH ; dimensions (y, x)
+	dw SSAnneKitchen_Blocks ; blocks
+	dw SSAnneKitchen_TextPointers ; texts
+	dw SSAnneKitchen_Script ; scripts
+	db 0 ; connections
+	dw SSAnneKitchen_Object ; objects
diff --git a/data/mapHeaders/SafariZoneCenter.asm b/data/mapHeaders/SafariZoneCenter.asm
new file mode 100755
index 00000000..8ec6c890
--- /dev/null
+++ b/data/mapHeaders/SafariZoneCenter.asm
@@ -0,0 +1,8 @@
+SafariZoneCenter_h:
+	db FOREST ; tileset
+	db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x)
+	dw SafariZoneCenter_Blocks ; blocks
+	dw SafariZoneCenter_TextPointers ; texts
+	dw SafariZoneCenter_Script ; scripts
+	db 0 ; connections
+	dw SafariZoneCenter_Object ; objects
diff --git a/data/mapHeaders/SafariZoneCenterRestHouse.asm b/data/mapHeaders/SafariZoneCenterRestHouse.asm
new file mode 100755
index 00000000..9b1064f2
--- /dev/null
+++ b/data/mapHeaders/SafariZoneCenterRestHouse.asm
@@ -0,0 +1,8 @@
+SafariZoneCenterRestHouse_h:
+	db GATE ; tileset
+	db SAFARI_ZONE_CENTER_REST_HOUSE_HEIGHT, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; dimensions (y, x)
+	dw SafariZoneCenterRestHouse_Blocks ; blocks
+	dw SafariZoneCenterRestHouse_TextPointers ; texts
+	dw SafariZoneCenterRestHouse_Script ; scripts
+	db 0 ; connections
+	dw SafariZoneCenterRestHouse_Object ; objects
diff --git a/data/mapHeaders/SafariZoneEast.asm b/data/mapHeaders/SafariZoneEast.asm
new file mode 100755
index 00000000..99556473
--- /dev/null
+++ b/data/mapHeaders/SafariZoneEast.asm
@@ -0,0 +1,8 @@
+SafariZoneEast_h:
+	db FOREST ; tileset
+	db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x)
+	dw SafariZoneEast_Blocks ; blocks
+	dw SafariZoneEast_TextPointers ; texts
+	dw SafariZoneEast_Script ; scripts
+	db 0 ; connections
+	dw SafariZoneEast_Object ; objects
diff --git a/data/mapHeaders/SafariZoneEastRestHouse.asm b/data/mapHeaders/SafariZoneEastRestHouse.asm
new file mode 100755
index 00000000..b9f219c5
--- /dev/null
+++ b/data/mapHeaders/SafariZoneEastRestHouse.asm
@@ -0,0 +1,8 @@
+SafariZoneEastRestHouse_h:
+	db GATE ; tileset
+	db SAFARI_ZONE_EAST_REST_HOUSE_HEIGHT, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; dimensions (y, x)
+	dw SafariZoneEastRestHouse_Blocks ; blocks
+	dw SafariZoneEastRestHouse_TextPointers ; texts
+	dw SafariZoneEastRestHouse_Script ; scripts
+	db 0 ; connections
+	dw SafariZoneEastRestHouse_Object ; objects
diff --git a/data/mapHeaders/SafariZoneGate.asm b/data/mapHeaders/SafariZoneGate.asm
new file mode 100755
index 00000000..ed306ad0
--- /dev/null
+++ b/data/mapHeaders/SafariZoneGate.asm
@@ -0,0 +1,8 @@
+SafariZoneGate_h:
+	db GATE ; tileset
+	db SAFARI_ZONE_GATE_HEIGHT, SAFARI_ZONE_GATE_WIDTH ; dimensions (y, x)
+	dw SafariZoneGate_Blocks ; blocks
+	dw SafariZoneGate_TextPointers ; texts
+	dw SafariZoneGate_Script ; scripts
+	db 0 ; connections
+	dw SafariZoneGate_Object ; objects
diff --git a/data/mapHeaders/SafariZoneNorth.asm b/data/mapHeaders/SafariZoneNorth.asm
new file mode 100755
index 00000000..3d1a2f51
--- /dev/null
+++ b/data/mapHeaders/SafariZoneNorth.asm
@@ -0,0 +1,8 @@
+SafariZoneNorth_h:
+	db FOREST ; tileset
+	db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x)
+	dw SafariZoneNorth_Blocks ; blocks
+	dw SafariZoneNorth_TextPointers ; texts
+	dw SafariZoneNorth_Script ; scripts
+	db 0 ; connections
+	dw SafariZoneNorth_Object ; objects
diff --git a/data/mapHeaders/SafariZoneNorthRestHouse.asm b/data/mapHeaders/SafariZoneNorthRestHouse.asm
new file mode 100755
index 00000000..938c15cf
--- /dev/null
+++ b/data/mapHeaders/SafariZoneNorthRestHouse.asm
@@ -0,0 +1,8 @@
+SafariZoneNorthRestHouse_h:
+	db GATE ; tileset
+	db SAFARI_ZONE_NORTH_REST_HOUSE_HEIGHT, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; dimensions (y, x)
+	dw SafariZoneNorthRestHouse_Blocks ; blocks
+	dw SafariZoneNorthRestHouse_TextPointers ; texts
+	dw SafariZoneNorthRestHouse_Script ; scripts
+	db 0 ; connections
+	dw SafariZoneNorthRestHouse_Object ; objects
diff --git a/data/mapHeaders/SafariZoneSecretHouse.asm b/data/mapHeaders/SafariZoneSecretHouse.asm
new file mode 100755
index 00000000..91068691
--- /dev/null
+++ b/data/mapHeaders/SafariZoneSecretHouse.asm
@@ -0,0 +1,8 @@
+SafariZoneSecretHouse_h:
+	db LAB ; tileset
+	db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x)
+	dw SafariZoneSecretHouse_Blocks ; blocks
+	dw SafariZoneSecretHouse_TextPointers ; texts
+	dw SafariZoneSecretHouse_Script ; scripts
+	db 0 ; connections
+	dw SafariZoneSecretHouse_Object ; objects
diff --git a/data/mapHeaders/SafariZoneWest.asm b/data/mapHeaders/SafariZoneWest.asm
new file mode 100755
index 00000000..876169d1
--- /dev/null
+++ b/data/mapHeaders/SafariZoneWest.asm
@@ -0,0 +1,8 @@
+SafariZoneWest_h:
+	db FOREST ; tileset
+	db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x)
+	dw SafariZoneWest_Blocks ; blocks
+	dw SafariZoneWest_TextPointers ; texts
+	dw SafariZoneWest_Script ; scripts
+	db 0 ; connections
+	dw SafariZoneWest_Object ; objects
diff --git a/data/mapHeaders/SafariZoneWestRestHouse.asm b/data/mapHeaders/SafariZoneWestRestHouse.asm
new file mode 100755
index 00000000..886382ec
--- /dev/null
+++ b/data/mapHeaders/SafariZoneWestRestHouse.asm
@@ -0,0 +1,8 @@
+SafariZoneWestRestHouse_h:
+	db GATE ; tileset
+	db SAFARI_ZONE_WEST_REST_HOUSE_HEIGHT, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; dimensions (y, x)
+	dw SafariZoneWestRestHouse_Blocks ; blocks
+	dw SafariZoneWestRestHouse_TextPointers ; texts
+	dw SafariZoneWestRestHouse_Script ; scripts
+	db 0 ; connections
+	dw SafariZoneWestRestHouse_Object ; objects
diff --git a/data/mapHeaders/SaffronCity.asm b/data/mapHeaders/SaffronCity.asm
new file mode 100755
index 00000000..13239891
--- /dev/null
+++ b/data/mapHeaders/SaffronCity.asm
@@ -0,0 +1,12 @@
+SaffronCity_h:
+	db OVERWORLD ; tileset
+	db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x)
+	dw SaffronCity_Blocks ; blocks
+	dw SaffronCity_TextPointers ; texts
+	dw SaffronCity_Script ; scripts
+	db NORTH | SOUTH | WEST | EAST ; connections
+	NORTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_5, 5, 0, Route5_Blocks
+	SOUTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_6, 5, 0, Route6_Blocks, 1
+	WEST_MAP_CONNECTION SAFFRON_CITY, ROUTE_7, 4, 0, Route7_Blocks
+	EAST_MAP_CONNECTION SAFFRON_CITY, ROUTE_8, 4, 0, Route8_Blocks
+	dw SaffronCity_Object ; objects
diff --git a/data/mapHeaders/SaffronGym.asm b/data/mapHeaders/SaffronGym.asm
new file mode 100755
index 00000000..6cbadb2c
--- /dev/null
+++ b/data/mapHeaders/SaffronGym.asm
@@ -0,0 +1,8 @@
+SaffronGym_h:
+	db FACILITY ; tileset
+	db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x)
+	dw SaffronGym_Blocks ; blocks
+	dw SaffronGym_TextPointers ; texts
+	dw SaffronGym_Script ; scripts
+	db 0 ; connections
+	dw SaffronGym_Object ; objects
diff --git a/data/mapHeaders/SaffronMart.asm b/data/mapHeaders/SaffronMart.asm
new file mode 100755
index 00000000..abd537b6
--- /dev/null
+++ b/data/mapHeaders/SaffronMart.asm
@@ -0,0 +1,8 @@
+SaffronMart_h:
+	db MART ; tileset
+	db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x)
+	dw SaffronMart_Blocks ; blocks
+	dw SaffronMart_TextPointers ; texts
+	dw SaffronMart_Script ; scripts
+	db 0 ; connections
+	dw SaffronMart_Object ; objects
diff --git a/data/mapHeaders/SaffronPidgeyHouse.asm b/data/mapHeaders/SaffronPidgeyHouse.asm
new file mode 100755
index 00000000..5d6e21ae
--- /dev/null
+++ b/data/mapHeaders/SaffronPidgeyHouse.asm
@@ -0,0 +1,8 @@
+SaffronPidgeyHouse_h:
+	db HOUSE ; tileset
+	db SAFFRON_PIDGEY_HOUSE_HEIGHT, SAFFRON_PIDGEY_HOUSE_WIDTH ; dimensions (y, x)
+	dw SaffronPidgeyHouse_Blocks ; blocks
+	dw SaffronPidgeyHouse_TextPointers ; texts
+	dw SaffronPidgeyHouse_Script ; scripts
+	db 0 ; connections
+	dw SaffronPidgeyHouse_Object ; objects
diff --git a/data/mapHeaders/SaffronPokecenter.asm b/data/mapHeaders/SaffronPokecenter.asm
new file mode 100755
index 00000000..32f1ec71
--- /dev/null
+++ b/data/mapHeaders/SaffronPokecenter.asm
@@ -0,0 +1,8 @@
+SaffronPokecenter_h:
+	db POKECENTER ; tileset
+	db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x)
+	dw SaffronPokecenter_Blocks ; blocks
+	dw SaffronPokecenter_TextPointers ; texts
+	dw SaffronPokecenter_Script ; scripts
+	db 0 ; connections
+	dw SaffronPokecenter_Object ; objects
diff --git a/data/mapHeaders/SeafoamIslands1F.asm b/data/mapHeaders/SeafoamIslands1F.asm
new file mode 100755
index 00000000..f5260cda
--- /dev/null
+++ b/data/mapHeaders/SeafoamIslands1F.asm
@@ -0,0 +1,8 @@
+SeafoamIslands1F_h:
+	db CAVERN ; tileset
+	db SEAFOAM_ISLANDS_1F_HEIGHT, SEAFOAM_ISLANDS_1F_WIDTH ; dimensions (y, x)
+	dw SeafoamIslands1F_Blocks ; blocks
+	dw SeafoamIslands1F_TextPointers ; texts
+	dw SeafoamIslands1F_Script ; scripts
+	db 0 ; connections
+	dw SeafoamIslands1F_Object ; objects
diff --git a/data/mapHeaders/SeafoamIslandsB1F.asm b/data/mapHeaders/SeafoamIslandsB1F.asm
new file mode 100755
index 00000000..23116f74
--- /dev/null
+++ b/data/mapHeaders/SeafoamIslandsB1F.asm
@@ -0,0 +1,8 @@
+SeafoamIslandsB1F_h:
+	db CAVERN ; tileset
+	db SEAFOAM_ISLANDS_B1F_HEIGHT, SEAFOAM_ISLANDS_B1F_WIDTH ; dimensions (y, x)
+	dw SeafoamIslandsB1F_Blocks ; blocks
+	dw SeafoamIslandsB1F_TextPointers ; texts
+	dw SeafoamIslandsB1F_Script ; scripts
+	db 0 ; connections
+	dw SeafoamIslandsB1F_Object ; objects
diff --git a/data/mapHeaders/SeafoamIslandsB2F.asm b/data/mapHeaders/SeafoamIslandsB2F.asm
new file mode 100755
index 00000000..10d45dad
--- /dev/null
+++ b/data/mapHeaders/SeafoamIslandsB2F.asm
@@ -0,0 +1,8 @@
+SeafoamIslandsB2F_h:
+	db CAVERN ; tileset
+	db SEAFOAM_ISLANDS_B2F_HEIGHT, SEAFOAM_ISLANDS_B2F_WIDTH ; dimensions (y, x)
+	dw SeafoamIslandsB2F_Blocks ; blocks
+	dw SeafoamIslandsB2F_TextPointers ; texts
+	dw SeafoamIslandsB2F_Script ; scripts
+	db 0 ; connections
+	dw SeafoamIslandsB2F_Object ; objects
diff --git a/data/mapHeaders/SeafoamIslandsB3F.asm b/data/mapHeaders/SeafoamIslandsB3F.asm
new file mode 100755
index 00000000..812d1121
--- /dev/null
+++ b/data/mapHeaders/SeafoamIslandsB3F.asm
@@ -0,0 +1,8 @@
+SeafoamIslandsB3F_h:
+	db CAVERN ; tileset
+	db SEAFOAM_ISLANDS_B3F_HEIGHT, SEAFOAM_ISLANDS_B3F_WIDTH ; dimensions (y, x)
+	dw SeafoamIslandsB3F_Blocks ; blocks
+	dw SeafoamIslandsB3F_TextPointers ; texts
+	dw SeafoamIslandsB3F_Script ; scripts
+	db 0 ; connections
+	dw SeafoamIslandsB3F_Object ; objects
diff --git a/data/mapHeaders/SeafoamIslandsB4F.asm b/data/mapHeaders/SeafoamIslandsB4F.asm
new file mode 100755
index 00000000..96c25e06
--- /dev/null
+++ b/data/mapHeaders/SeafoamIslandsB4F.asm
@@ -0,0 +1,8 @@
+SeafoamIslandsB4F_h:
+	db CAVERN ; tileset
+	db SEAFOAM_ISLANDS_B4F_HEIGHT, SEAFOAM_ISLANDS_B4F_WIDTH ; dimensions (y, x)
+	dw SeafoamIslandsB4F_Blocks ; blocks
+	dw SeafoamIslandsB4F_TextPointers ; texts
+	dw SeafoamIslandsB4F_Script ; scripts
+	db 0 ; connections
+	dw SeafoamIslandsB4F_Object ; objects
diff --git a/data/mapHeaders/SilphCo10F.asm b/data/mapHeaders/SilphCo10F.asm
new file mode 100755
index 00000000..ad040479
--- /dev/null
+++ b/data/mapHeaders/SilphCo10F.asm
@@ -0,0 +1,8 @@
+SilphCo10F_h:
+	db FACILITY ; tileset
+	db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x)
+	dw SilphCo10F_Blocks ; blocks
+	dw SilphCo10F_TextPointers ; texts
+	dw SilphCo10F_Script ; scripts
+	db 0 ; connections
+	dw SilphCo10F_Object ; objects
diff --git a/data/mapHeaders/SilphCo11F.asm b/data/mapHeaders/SilphCo11F.asm
new file mode 100755
index 00000000..08d6d650
--- /dev/null
+++ b/data/mapHeaders/SilphCo11F.asm
@@ -0,0 +1,8 @@
+SilphCo11F_h:
+	db INTERIOR ; tileset
+	db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x)
+	dw SilphCo11F_Blocks ; blocks
+	dw SilphCo11F_TextPointers ; texts
+	dw SilphCo11F_Script ; scripts
+	db 0 ; connections
+	dw SilphCo11F_Object ; objects
diff --git a/data/mapHeaders/SilphCo1F.asm b/data/mapHeaders/SilphCo1F.asm
new file mode 100755
index 00000000..45e6c5bf
--- /dev/null
+++ b/data/mapHeaders/SilphCo1F.asm
@@ -0,0 +1,8 @@
+SilphCo1F_h:
+	db FACILITY ; tileset
+	db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x)
+	dw SilphCo1F_Blocks ; blocks
+	dw SilphCo1F_TextPointers ; texts
+	dw SilphCo1F_Script ; scripts
+	db 0 ; connections
+	dw SilphCo1F_Object ; objects
diff --git a/data/mapHeaders/SilphCo2F.asm b/data/mapHeaders/SilphCo2F.asm
new file mode 100755
index 00000000..69c2fb51
--- /dev/null
+++ b/data/mapHeaders/SilphCo2F.asm
@@ -0,0 +1,8 @@
+SilphCo2F_h:
+	db FACILITY ; tileset
+	db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x)
+	dw SilphCo2F_Blocks ; blocks
+	dw SilphCo2F_TextPointers ; texts
+	dw SilphCo2F_Script ; scripts
+	db 0 ; connections
+	dw SilphCo2F_Object ; objects
diff --git a/data/mapHeaders/SilphCo3F.asm b/data/mapHeaders/SilphCo3F.asm
new file mode 100755
index 00000000..6911a604
--- /dev/null
+++ b/data/mapHeaders/SilphCo3F.asm
@@ -0,0 +1,8 @@
+SilphCo3F_h:
+	db FACILITY ; tileset
+	db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x)
+	dw SilphCo3F_Blocks ; blocks
+	dw SilphCo3F_TextPointers ; texts
+	dw SilphCo3F_Script ; scripts
+	db 0 ; connections
+	dw SilphCo3F_Object ; objects
diff --git a/data/mapHeaders/SilphCo4F.asm b/data/mapHeaders/SilphCo4F.asm
new file mode 100755
index 00000000..591ddc07
--- /dev/null
+++ b/data/mapHeaders/SilphCo4F.asm
@@ -0,0 +1,8 @@
+SilphCo4F_h:
+	db FACILITY ; tileset
+	db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x)
+	dw SilphCo4F_Blocks ; blocks
+	dw SilphCo4F_TextPointers ; texts
+	dw SilphCo4F_Script ; scripts
+	db 0 ; connections
+	dw SilphCo4F_Object ; objects
diff --git a/data/mapHeaders/SilphCo5F.asm b/data/mapHeaders/SilphCo5F.asm
new file mode 100755
index 00000000..0303ceba
--- /dev/null
+++ b/data/mapHeaders/SilphCo5F.asm
@@ -0,0 +1,8 @@
+SilphCo5F_h:
+	db FACILITY ; tileset
+	db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x)
+	dw SilphCo5F_Blocks ; blocks
+	dw SilphCo5F_TextPointers ; texts
+	dw SilphCo5F_Script ; scripts
+	db 0 ; connections
+	dw SilphCo5F_Object ; objects
diff --git a/data/mapHeaders/SilphCo6F.asm b/data/mapHeaders/SilphCo6F.asm
new file mode 100755
index 00000000..b26a7587
--- /dev/null
+++ b/data/mapHeaders/SilphCo6F.asm
@@ -0,0 +1,8 @@
+SilphCo6F_h:
+	db FACILITY ; tileset
+	db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x)
+	dw SilphCo6F_Blocks ; blocks
+	dw SilphCo6F_TextPointers ; texts
+	dw SilphCo6F_Script ; scripts
+	db 0 ; connections
+	dw SilphCo6F_Object ; objects
diff --git a/data/mapHeaders/SilphCo7F.asm b/data/mapHeaders/SilphCo7F.asm
new file mode 100755
index 00000000..5c6ea959
--- /dev/null
+++ b/data/mapHeaders/SilphCo7F.asm
@@ -0,0 +1,8 @@
+SilphCo7F_h:
+	db FACILITY ; tileset
+	db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x)
+	dw SilphCo7F_Blocks ; blocks
+	dw SilphCo7F_TextPointers ; texts
+	dw SilphCo7F_Script ; scripts
+	db 0 ; connections
+	dw SilphCo7F_Object ; objects
diff --git a/data/mapHeaders/SilphCo8F.asm b/data/mapHeaders/SilphCo8F.asm
new file mode 100755
index 00000000..e467298e
--- /dev/null
+++ b/data/mapHeaders/SilphCo8F.asm
@@ -0,0 +1,8 @@
+SilphCo8F_h:
+	db FACILITY ; tileset
+	db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x)
+	dw SilphCo8F_Blocks ; blocks
+	dw SilphCo8F_TextPointers ; texts
+	dw SilphCo8F_Script ; scripts
+	db 0 ; connections
+	dw SilphCo8F_Object ; objects
diff --git a/data/mapHeaders/SilphCo9F.asm b/data/mapHeaders/SilphCo9F.asm
new file mode 100755
index 00000000..ec591e51
--- /dev/null
+++ b/data/mapHeaders/SilphCo9F.asm
@@ -0,0 +1,8 @@
+SilphCo9F_h:
+	db FACILITY ; tileset
+	db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x)
+	dw SilphCo9F_Blocks ; blocks
+	dw SilphCo9F_TextPointers ; texts
+	dw SilphCo9F_Script ; scripts
+	db 0 ; connections
+	dw SilphCo9F_Object ; objects
diff --git a/data/mapHeaders/SilphCoElevator.asm b/data/mapHeaders/SilphCoElevator.asm
new file mode 100755
index 00000000..0abe2810
--- /dev/null
+++ b/data/mapHeaders/SilphCoElevator.asm
@@ -0,0 +1,8 @@
+SilphCoElevator_h:
+	db LOBBY ; tileset
+	db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x)
+	dw SilphCoElevator_Blocks ; blocks
+	dw SilphCoElevator_TextPointers ; texts
+	dw SilphCoElevator_Script ; scripts
+	db 0 ; connections
+	dw SilphCoElevator_Object ; objects
diff --git a/data/mapHeaders/TradeCenter.asm b/data/mapHeaders/TradeCenter.asm
new file mode 100755
index 00000000..39981c35
--- /dev/null
+++ b/data/mapHeaders/TradeCenter.asm
@@ -0,0 +1,8 @@
+TradeCenter_h:
+	db CLUB ; tileset
+	db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x)
+	dw TradeCenter_Blocks ; blocks
+	dw TradeCenter_TextPointers ; texts
+	dw TradeCenter_Script ; scripts
+	db 0 ; connections
+	dw TradeCenter_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathNorthSouth.asm b/data/mapHeaders/UndergroundPathNorthSouth.asm
new file mode 100755
index 00000000..5dd8cdf8
--- /dev/null
+++ b/data/mapHeaders/UndergroundPathNorthSouth.asm
@@ -0,0 +1,8 @@
+UndergroundPathNorthSouth_h:
+	db UNDERGROUND ; tileset
+	db UNDERGROUND_PATH_NORTH_SOUTH_HEIGHT, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; dimensions (y, x)
+	dw UndergroundPathNorthSouth_Blocks ; blocks
+	dw UndergroundPathNorthSouth_TextPointers ; texts
+	dw UndergroundPathNorthSouth_Script ; scripts
+	db 0 ; connections
+	dw UndergroundPathNorthSouth_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathRoute5.asm b/data/mapHeaders/UndergroundPathRoute5.asm
new file mode 100755
index 00000000..14c6aa4d
--- /dev/null
+++ b/data/mapHeaders/UndergroundPathRoute5.asm
@@ -0,0 +1,8 @@
+UndergroundPathRoute5_h:
+	db GATE ; tileset
+	db UNDERGROUND_PATH_ROUTE_5_HEIGHT, UNDERGROUND_PATH_ROUTE_5_WIDTH ; dimensions (y, x)
+	dw UndergroundPathRoute5_Blocks ; blocks
+	dw UndergroundPathRoute5_TextPointers ; texts
+	dw UndergroundPathRoute5_Script ; scripts
+	db 0 ; connections
+	dw UndergroundPathRoute5_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathRoute6.asm b/data/mapHeaders/UndergroundPathRoute6.asm
new file mode 100755
index 00000000..6aea459c
--- /dev/null
+++ b/data/mapHeaders/UndergroundPathRoute6.asm
@@ -0,0 +1,8 @@
+UndergroundPathRoute6_h:
+	db GATE ; tileset
+	db UNDERGROUND_PATH_ROUTE_6_HEIGHT, UNDERGROUND_PATH_ROUTE_6_WIDTH ; dimensions (y, x)
+	dw UndergroundPathRoute6_Blocks ; blocks
+	dw UndergroundPathRoute6_TextPointers ; texts
+	dw UndergroundPathRoute6_Script ; scripts
+	db 0 ; connections
+	dw UndergroundPathRoute6_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathRoute7.asm b/data/mapHeaders/UndergroundPathRoute7.asm
new file mode 100755
index 00000000..91495ea3
--- /dev/null
+++ b/data/mapHeaders/UndergroundPathRoute7.asm
@@ -0,0 +1,8 @@
+UndergroundPathRoute7_h:
+	db GATE ; tileset
+	db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x)
+	dw UndergroundPathRoute7_Blocks ; blocks
+	dw UndergroundPathRoute7_TextPointers ; texts
+	dw UndergroundPathRoute7_Script ; scripts
+	db 0 ; connections
+	dw UndergroundPathRoute7_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathRoute7Copy.asm b/data/mapHeaders/UndergroundPathRoute7Copy.asm
new file mode 100755
index 00000000..9d3f4c62
--- /dev/null
+++ b/data/mapHeaders/UndergroundPathRoute7Copy.asm
@@ -0,0 +1,8 @@
+UndergroundPathRoute7Copy_h:
+	db GATE ; tileset
+	db UNDERGROUND_PATH_ROUTE_7_HEIGHT, UNDERGROUND_PATH_ROUTE_7_WIDTH ; dimensions (y, x)
+	dw UndergroundPathRoute7Copy_Blocks ; blocks
+	dw UndergroundPathRoute7Copy_TextPointers ; texts
+	dw UndergroundPathRoute7Copy_Script ; scripts
+	db 0 ; connections
+	dw UndergroundPathRoute7Copy_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathRoute8.asm b/data/mapHeaders/UndergroundPathRoute8.asm
new file mode 100755
index 00000000..f34265b8
--- /dev/null
+++ b/data/mapHeaders/UndergroundPathRoute8.asm
@@ -0,0 +1,8 @@
+UndergroundPathRoute8_h:
+	db GATE ; tileset
+	db UNDERGROUND_PATH_ROUTE_8_HEIGHT, UNDERGROUND_PATH_ROUTE_8_WIDTH ; dimensions (y, x)
+	dw UndergroundPathRoute8_Blocks ; blocks
+	dw UndergroundPathRoute8_TextPointers ; texts
+	dw UndergroundPathRoute8_Script ; scripts
+	db 0 ; connections
+	dw UndergroundPathRoute8_Object ; objects
diff --git a/data/mapHeaders/UndergroundPathWestEast.asm b/data/mapHeaders/UndergroundPathWestEast.asm
new file mode 100755
index 00000000..d084bd73
--- /dev/null
+++ b/data/mapHeaders/UndergroundPathWestEast.asm
@@ -0,0 +1,8 @@
+UndergroundPathWestEast_h:
+	db UNDERGROUND ; tileset
+	db UNDERGROUND_PATH_WEST_EAST_HEIGHT, UNDERGROUND_PATH_WEST_EAST_WIDTH ; dimensions (y, x)
+	dw UndergroundPathWestEast_Blocks ; blocks
+	dw UndergroundPathWestEast_TextPointers ; texts
+	dw UndergroundPathWestEast_Script ; scripts
+	db 0 ; connections
+	dw UndergroundPathWestEast_Object ; objects
diff --git a/data/mapHeaders/VermilionCity.asm b/data/mapHeaders/VermilionCity.asm
new file mode 100755
index 00000000..6521ad89
--- /dev/null
+++ b/data/mapHeaders/VermilionCity.asm
@@ -0,0 +1,10 @@
+VermilionCity_h:
+	db OVERWORLD ; tileset
+	db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x)
+	dw VermilionCity_Blocks ; blocks
+	dw VermilionCity_TextPointers ; texts
+	dw VermilionCity_Script ; scripts
+	db NORTH | EAST ; connections
+	NORTH_MAP_CONNECTION VERMILION_CITY, ROUTE_6, 5, 0, Route6_Blocks
+	EAST_MAP_CONNECTION VERMILION_CITY, ROUTE_11, 4, 0, Route11_Blocks
+	dw VermilionCity_Object ; objects
diff --git a/data/mapHeaders/VermilionDock.asm b/data/mapHeaders/VermilionDock.asm
new file mode 100755
index 00000000..f7dca8e6
--- /dev/null
+++ b/data/mapHeaders/VermilionDock.asm
@@ -0,0 +1,8 @@
+VermilionDock_h:
+	db SHIP_PORT ; tileset
+	db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x)
+	dw VermilionDock_Blocks ; blocks
+	dw VermilionDock_TextPointers ; texts
+	dw VermilionDock_Script ; scripts
+	db 0 ; connections
+	dw VermilionDock_Object ; objects
diff --git a/data/mapHeaders/VermilionGym.asm b/data/mapHeaders/VermilionGym.asm
new file mode 100755
index 00000000..fe304a2e
--- /dev/null
+++ b/data/mapHeaders/VermilionGym.asm
@@ -0,0 +1,8 @@
+VermilionGym_h:
+	db GYM ; tileset
+	db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x)
+	dw VermilionGym_Blocks ; blocks
+	dw VermilionGym_TextPointers ; texts
+	dw VermilionGym_Script ; scripts
+	db 0 ; connections
+	dw VermilionGym_Object ; objects
diff --git a/data/mapHeaders/VermilionMart.asm b/data/mapHeaders/VermilionMart.asm
new file mode 100755
index 00000000..67f24f59
--- /dev/null
+++ b/data/mapHeaders/VermilionMart.asm
@@ -0,0 +1,8 @@
+VermilionMart_h:
+	db MART ; tileset
+	db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x)
+	dw VermilionMart_Blocks ; blocks
+	dw VermilionMart_TextPointers ; texts
+	dw VermilionMart_Script ; scripts
+	db 0 ; connections
+	dw VermilionMart_Object ; objects
diff --git a/data/mapHeaders/VermilionOldRodHouse.asm b/data/mapHeaders/VermilionOldRodHouse.asm
new file mode 100755
index 00000000..f4b69110
--- /dev/null
+++ b/data/mapHeaders/VermilionOldRodHouse.asm
@@ -0,0 +1,8 @@
+VermilionOldRodHouse_h:
+	db HOUSE ; tileset
+	db VERMILION_OLD_ROD_HOUSE_HEIGHT, VERMILION_OLD_ROD_HOUSE_WIDTH ; dimensions (y, x)
+	dw VermilionOldRodHouse_Blocks ; blocks
+	dw VermilionOldRodHouse_TextPointers ; texts
+	dw VermilionOldRodHouse_Script ; scripts
+	db 0 ; connections
+	dw VermilionOldRodHouse_Object ; objects
diff --git a/data/mapHeaders/VermilionPidgeyHouse.asm b/data/mapHeaders/VermilionPidgeyHouse.asm
new file mode 100755
index 00000000..af052fa6
--- /dev/null
+++ b/data/mapHeaders/VermilionPidgeyHouse.asm
@@ -0,0 +1,8 @@
+VermilionPidgeyHouse_h:
+	db HOUSE ; tileset
+	db VERMILION_PIDGEY_HOUSE_HEIGHT, VERMILION_PIDGEY_HOUSE_WIDTH ; dimensions (y, x)
+	dw VermilionPidgeyHouse_Blocks ; blocks
+	dw VermilionPidgeyHouse_TextPointers ; texts
+	dw VermilionPidgeyHouse_Script ; scripts
+	db 0 ; connections
+	dw VermilionPidgeyHouse_Object ; objects
diff --git a/data/mapHeaders/VermilionPokecenter.asm b/data/mapHeaders/VermilionPokecenter.asm
new file mode 100755
index 00000000..3d4c23ec
--- /dev/null
+++ b/data/mapHeaders/VermilionPokecenter.asm
@@ -0,0 +1,8 @@
+VermilionPokecenter_h:
+	db POKECENTER ; tileset
+	db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x)
+	dw VermilionPokecenter_Blocks ; blocks
+	dw VermilionPokecenter_TextPointers ; texts
+	dw VermilionPokecenter_Script ; scripts
+	db 0 ; connections
+	dw VermilionPokecenter_Object ; objects
diff --git a/data/mapHeaders/VermilionTradeHouse.asm b/data/mapHeaders/VermilionTradeHouse.asm
new file mode 100755
index 00000000..21d30049
--- /dev/null
+++ b/data/mapHeaders/VermilionTradeHouse.asm
@@ -0,0 +1,8 @@
+VermilionTradeHouse_h:
+	db HOUSE ; tileset
+	db VERMILION_TRADE_HOUSE_HEIGHT, VERMILION_TRADE_HOUSE_WIDTH ; dimensions (y, x)
+	dw VermilionTradeHouse_Blocks ; blocks
+	dw VermilionTradeHouse_TextPointers ; texts
+	dw VermilionTradeHouse_Script ; scripts
+	db 0 ; connections
+	dw VermilionTradeHouse_Object ; objects
diff --git a/data/mapHeaders/VictoryRoad1F.asm b/data/mapHeaders/VictoryRoad1F.asm
new file mode 100755
index 00000000..3508d782
--- /dev/null
+++ b/data/mapHeaders/VictoryRoad1F.asm
@@ -0,0 +1,8 @@
+VictoryRoad1F_h:
+	db CAVERN ; tileset
+	db VICTORY_ROAD_1F_HEIGHT, VICTORY_ROAD_1F_WIDTH ; dimensions (y, x)
+	dw VictoryRoad1F_Blocks ; blocks
+	dw VictoryRoad1F_TextPointers ; texts
+	dw VictoryRoad1F_Script ; scripts
+	db 0 ; connections
+	dw VictoryRoad1F_Object ; objects
diff --git a/data/mapHeaders/VictoryRoad2F.asm b/data/mapHeaders/VictoryRoad2F.asm
new file mode 100755
index 00000000..31693c1c
--- /dev/null
+++ b/data/mapHeaders/VictoryRoad2F.asm
@@ -0,0 +1,8 @@
+VictoryRoad2F_h:
+	db CAVERN ; tileset
+	db VICTORY_ROAD_2F_HEIGHT, VICTORY_ROAD_2F_WIDTH ; dimensions (y, x)
+	dw VictoryRoad2F_Blocks ; blocks
+	dw VictoryRoad2F_TextPointers ; texts
+	dw VictoryRoad2F_Script ; scripts
+	db 0 ; connections
+	dw VictoryRoad2F_Object ; objects
diff --git a/data/mapHeaders/VictoryRoad3F.asm b/data/mapHeaders/VictoryRoad3F.asm
new file mode 100755
index 00000000..3f5e21d2
--- /dev/null
+++ b/data/mapHeaders/VictoryRoad3F.asm
@@ -0,0 +1,8 @@
+VictoryRoad3F_h:
+	db CAVERN ; tileset
+	db VICTORY_ROAD_3F_HEIGHT, VICTORY_ROAD_3F_WIDTH ; dimensions (y, x)
+	dw VictoryRoad3F_Blocks ; blocks
+	dw VictoryRoad3F_TextPointers ; texts
+	dw VictoryRoad3F_Script ; scripts
+	db 0 ; connections
+	dw VictoryRoad3F_Object ; objects
diff --git a/data/mapHeaders/ViridianCity.asm b/data/mapHeaders/ViridianCity.asm
new file mode 100755
index 00000000..09f7b9f4
--- /dev/null
+++ b/data/mapHeaders/ViridianCity.asm
@@ -0,0 +1,11 @@
+ViridianCity_h:
+	db OVERWORLD ; tileset
+	db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x)
+	dw ViridianCity_Blocks ; blocks
+	dw ViridianCity_TextPointers ; texts
+	dw ViridianCity_Script ; scripts
+	db NORTH | SOUTH | WEST ; connections
+	NORTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_2, 5, 0, Route2_Blocks
+	SOUTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_1, 5, 0, Route1_Blocks, 1
+	WEST_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_22, 4, 0, Route22_Blocks
+	dw ViridianCity_Object ; objects
diff --git a/data/mapHeaders/ViridianForest.asm b/data/mapHeaders/ViridianForest.asm
new file mode 100755
index 00000000..a8df3e6e
--- /dev/null
+++ b/data/mapHeaders/ViridianForest.asm
@@ -0,0 +1,8 @@
+ViridianForest_h:
+	db FOREST ; tileset
+	db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x)
+	dw ViridianForest_Blocks ; blocks
+	dw ViridianForest_TextPointers ; texts
+	dw ViridianForest_Script ; scripts
+	db 0 ; connections
+	dw ViridianForest_Object ; objects
diff --git a/data/mapHeaders/ViridianForestNorthGate.asm b/data/mapHeaders/ViridianForestNorthGate.asm
new file mode 100755
index 00000000..48535977
--- /dev/null
+++ b/data/mapHeaders/ViridianForestNorthGate.asm
@@ -0,0 +1,8 @@
+ViridianForestNorthGate_h:
+	db FOREST_GATE ; tileset
+	db VIRIDIAN_FOREST_NORTH_GATE_HEIGHT, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; dimensions (y, x)
+	dw ViridianForestNorthGate_Blocks ; blocks
+	dw ViridianForestNorthGate_TextPointers ; texts
+	dw ViridianForestNorthGate_Script ; scripts
+	db 0 ; connections
+	dw ViridianForestNorthGate_Object ; objects
diff --git a/data/mapHeaders/ViridianForestSouthGate.asm b/data/mapHeaders/ViridianForestSouthGate.asm
new file mode 100755
index 00000000..b134ebea
--- /dev/null
+++ b/data/mapHeaders/ViridianForestSouthGate.asm
@@ -0,0 +1,8 @@
+ViridianForestSouthGate_h:
+	db FOREST_GATE ; tileset
+	db VIRIDIAN_FOREST_SOUTH_GATE_HEIGHT, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; dimensions (y, x)
+	dw ViridianForestSouthGate_Blocks ; blocks
+	dw ViridianForestSouthGate_TextPointers ; texts
+	dw ViridianForestSouthGate_Script ; scripts
+	db 0 ; connections
+	dw ViridianForestSouthGate_Object ; objects
diff --git a/data/mapHeaders/ViridianGym.asm b/data/mapHeaders/ViridianGym.asm
new file mode 100755
index 00000000..9b27845c
--- /dev/null
+++ b/data/mapHeaders/ViridianGym.asm
@@ -0,0 +1,8 @@
+ViridianGym_h:
+	db GYM ; tileset
+	db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x)
+	dw ViridianGym_Blocks ; blocks
+	dw ViridianGym_TextPointers ; texts
+	dw ViridianGym_Script ; scripts
+	db 0 ; connections
+	dw ViridianGym_Object ; objects
diff --git a/data/mapHeaders/ViridianMart.asm b/data/mapHeaders/ViridianMart.asm
new file mode 100755
index 00000000..063f3327
--- /dev/null
+++ b/data/mapHeaders/ViridianMart.asm
@@ -0,0 +1,8 @@
+ViridianMart_h:
+	db MART ; tileset
+	db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x)
+	dw ViridianMart_Blocks ; blocks
+	dw ViridianMart_TextPointers ; texts
+	dw ViridianMart_Script ; scripts
+	db 0 ; connections
+	dw ViridianMart_Object ; objects
diff --git a/data/mapHeaders/ViridianNicknameHouse.asm b/data/mapHeaders/ViridianNicknameHouse.asm
new file mode 100755
index 00000000..b6a00392
--- /dev/null
+++ b/data/mapHeaders/ViridianNicknameHouse.asm
@@ -0,0 +1,8 @@
+ViridianNicknameHouse_h:
+	db HOUSE ; tileset
+	db VIRIDIAN_NICKNAME_HOUSE_HEIGHT, VIRIDIAN_NICKNAME_HOUSE_WIDTH ; dimensions (y, x)
+	dw ViridianNicknameHouse_Blocks ; blocks
+	dw ViridianNicknameHouse_TextPointers ; texts
+	dw ViridianNicknameHouse_Script ; scripts
+	db 0 ; connections
+	dw ViridianNicknameHouse_Object ; objects
diff --git a/data/mapHeaders/ViridianPokecenter.asm b/data/mapHeaders/ViridianPokecenter.asm
new file mode 100755
index 00000000..25c569d8
--- /dev/null
+++ b/data/mapHeaders/ViridianPokecenter.asm
@@ -0,0 +1,8 @@
+ViridianPokecenter_h:
+	db POKECENTER ; tileset
+	db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x)
+	dw ViridianPokecenter_Blocks ; blocks
+	dw ViridianPokecenter_TextPointers ; texts
+	dw ViridianPokecenter_Script ; scripts
+	db 0 ; connections
+	dw ViridianPokecenter_Object ; objects
diff --git a/data/mapHeaders/ViridianSchoolHouse.asm b/data/mapHeaders/ViridianSchoolHouse.asm
new file mode 100755
index 00000000..15e5c88f
--- /dev/null
+++ b/data/mapHeaders/ViridianSchoolHouse.asm
@@ -0,0 +1,8 @@
+ViridianSchoolHouse_h:
+	db HOUSE ; tileset
+	db VIRIDIAN_SCHOOL_HOUSE_HEIGHT, VIRIDIAN_SCHOOL_HOUSE_WIDTH ; dimensions (y, x)
+	dw ViridianSchoolHouse_Blocks ; blocks
+	dw ViridianSchoolHouse_TextPointers ; texts
+	dw ViridianSchoolHouse_Script ; scripts
+	db 0 ; connections
+	dw ViridianSchoolHouse_Object ; objects
diff --git a/data/mapHeaders/WardensHouse.asm b/data/mapHeaders/WardensHouse.asm
new file mode 100755
index 00000000..128e357a
--- /dev/null
+++ b/data/mapHeaders/WardensHouse.asm
@@ -0,0 +1,8 @@
+WardensHouse_h:
+	db LAB ; tileset
+	db WARDENS_HOUSE_HEIGHT, WARDENS_HOUSE_WIDTH ; dimensions (y, x)
+	dw WardensHouse_Blocks ; blocks
+	dw WardensHouse_TextPointers ; texts
+	dw WardensHouse_Script ; scripts
+	db 0 ; connections
+	dw WardensHouse_Object ; objects
diff --git a/data/mapHeaders/agatha.asm b/data/mapHeaders/agatha.asm
deleted file mode 100755
index 155f07db..00000000
--- a/data/mapHeaders/agatha.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Agatha_h:
-	db CEMETERY ; tileset
-	db AGATHAS_ROOM_HEIGHT, AGATHAS_ROOM_WIDTH ; dimensions (y, x)
-	dw AgathaBlocks, AgathaTextPointers, AgathaScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw AgathaObject ; objects
diff --git a/data/mapHeaders/bikeshop.asm b/data/mapHeaders/bikeshop.asm
deleted file mode 100755
index 1524f59b..00000000
--- a/data/mapHeaders/bikeshop.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-BikeShop_h:
-	db CLUB ; tileset
-	db BIKE_SHOP_HEIGHT, BIKE_SHOP_WIDTH ; dimensions (y, x)
-	dw BikeShopBlocks, BikeShopTextPointers, BikeShopScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw BikeShopObject ; objects
diff --git a/data/mapHeaders/billshouse.asm b/data/mapHeaders/billshouse.asm
deleted file mode 100755
index 832affe9..00000000
--- a/data/mapHeaders/billshouse.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-BillsHouse_h:
-	db INTERIOR ; tileset
-	db BILLS_HOUSE_HEIGHT, BILLS_HOUSE_WIDTH ; dimensions (y, x)
-	dw BillsHouseBlocks, BillsHouseTextPointers, BillsHouseScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw BillsHouseObject ; objects
diff --git a/data/mapHeaders/blueshouse.asm b/data/mapHeaders/blueshouse.asm
deleted file mode 100755
index 4b5c45e7..00000000
--- a/data/mapHeaders/blueshouse.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-BluesHouse_h:
-	db HOUSE ; tileset
-	db BLUES_HOUSE_HEIGHT, BLUES_HOUSE_WIDTH ; dimensions (y, x)
-	dw BluesHouseBlocks, BluesHouseTextPointers, BluesHouseScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw BluesHouseObject ; objects
diff --git a/data/mapHeaders/bruno.asm b/data/mapHeaders/bruno.asm
deleted file mode 100755
index 921fa80c..00000000
--- a/data/mapHeaders/bruno.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Bruno_h:
-	db GYM ; tileset
-	db BRUNOS_ROOM_HEIGHT, BRUNOS_ROOM_WIDTH ; dimensions (y, x)
-	dw BrunoBlocks, BrunoTextPointers, BrunoScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw BrunoObject ; objects
diff --git a/data/mapHeaders/celadoncity.asm b/data/mapHeaders/celadoncity.asm
deleted file mode 100755
index 7f94cad5..00000000
--- a/data/mapHeaders/celadoncity.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CeladonCity_h:
-	db OVERWORLD ; tileset
-	db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x)
-	dw CeladonCityBlocks, CeladonCityTextPointers, CeladonCityScript ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION CELADON_CITY, ROUTE_16, 4, 0, Route16Blocks
-	EAST_MAP_CONNECTION CELADON_CITY, ROUTE_7, 4, 0, Route7Blocks, 1
-	dw CeladonCityObject ; objects
diff --git a/data/mapHeaders/celadondiner.asm b/data/mapHeaders/celadondiner.asm
deleted file mode 100755
index f608af16..00000000
--- a/data/mapHeaders/celadondiner.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonDiner_h:
-	db LOBBY ; tileset
-	db CELADON_DINER_HEIGHT, CELADON_DINER_WIDTH ; dimensions (y, x)
-	dw CeladonDinerBlocks, CeladonDinerTextPointers, CeladonDinerScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonDinerObject ; objects
diff --git a/data/mapHeaders/celadongamecorner.asm b/data/mapHeaders/celadongamecorner.asm
deleted file mode 100755
index 76403d92..00000000
--- a/data/mapHeaders/celadongamecorner.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonGameCorner_h:
-	db LOBBY ; tileset
-	db GAME_CORNER_HEIGHT, GAME_CORNER_WIDTH ; dimensions (y, x)
-	dw CeladonGameCornerBlocks, CeladonGameCornerTextPointers, CeladonGameCornerScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonGameCornerObject ; objects
diff --git a/data/mapHeaders/celadongym.asm b/data/mapHeaders/celadongym.asm
deleted file mode 100755
index 78e486f3..00000000
--- a/data/mapHeaders/celadongym.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonGym_h:
-	db GYM ; tileset
-	db CELADON_GYM_HEIGHT, CELADON_GYM_WIDTH ; dimensions (y, x)
-	dw CeladonGymBlocks, CeladonGymTextPointers, CeladonGymScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonGymObject ; objects
diff --git a/data/mapHeaders/celadonhotel.asm b/data/mapHeaders/celadonhotel.asm
deleted file mode 100755
index ddc27cd6..00000000
--- a/data/mapHeaders/celadonhotel.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonHotel_h:
-	db POKECENTER ; tileset
-	db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x)
-	dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonHotelObject ; objects
diff --git a/data/mapHeaders/celadonhouse.asm b/data/mapHeaders/celadonhouse.asm
deleted file mode 100755
index d6d27a64..00000000
--- a/data/mapHeaders/celadonhouse.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonHouse_h:
-	db MANSION ; tileset
-	db CELADON_HOUSE_HEIGHT, CELADON_HOUSE_WIDTH ; dimensions (y, x)
-	dw CeladonHouseBlocks, CeladonHouseTextPointers, CeladonHouseScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonHouseObject ; objects
diff --git a/data/mapHeaders/celadonmansion1.asm b/data/mapHeaders/celadonmansion1.asm
deleted file mode 100755
index da773943..00000000
--- a/data/mapHeaders/celadonmansion1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonMansion1_h:
-	db MANSION ; tileset
-	db CELADON_MANSION_1_HEIGHT, CELADON_MANSION_1_WIDTH ; dimensions (y, x)
-	dw CeladonMansion1Blocks, CeladonMansion1TextPointers, CeladonMansion1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonMansion1Object ; objects
diff --git a/data/mapHeaders/celadonmansion2.asm b/data/mapHeaders/celadonmansion2.asm
deleted file mode 100755
index 92970148..00000000
--- a/data/mapHeaders/celadonmansion2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonMansion2_h:
-	db MANSION ; tileset
-	db CELADON_MANSION_2_HEIGHT, CELADON_MANSION_2_WIDTH ; dimensions (y, x)
-	dw CeladonMansion2Blocks, CeladonMansion2TextPointers, CeladonMansion2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonMansion2Object ; objects
diff --git a/data/mapHeaders/celadonmansion3.asm b/data/mapHeaders/celadonmansion3.asm
deleted file mode 100755
index 95c93bd7..00000000
--- a/data/mapHeaders/celadonmansion3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonMansion3_h:
-	db MANSION ; tileset
-	db CELADON_MANSION_3_HEIGHT, CELADON_MANSION_3_WIDTH ; dimensions (y, x)
-	dw CeladonMansion3Blocks, CeladonMansion3TextPointers, CeladonMansion3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonMansion3Object ; objects
diff --git a/data/mapHeaders/celadonmansion4.asm b/data/mapHeaders/celadonmansion4.asm
deleted file mode 100755
index 6b4e833a..00000000
--- a/data/mapHeaders/celadonmansion4.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonMansion4_h:
-	db MANSION ; tileset
-	db CELADON_MANSION_4_HEIGHT, CELADON_MANSION_4_WIDTH ; dimensions (y, x)
-	dw CeladonMansion4Blocks, CeladonMansion4TextPointers, CeladonMansion4Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonMansion4Object ; objects
diff --git a/data/mapHeaders/celadonmansion5.asm b/data/mapHeaders/celadonmansion5.asm
deleted file mode 100755
index 7cc16d24..00000000
--- a/data/mapHeaders/celadonmansion5.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonMansion5_h:
-	db HOUSE ; tileset
-	db CELADON_MANSION_5_HEIGHT, CELADON_MANSION_5_WIDTH ; dimensions (y, x)
-	dw CeladonMansion5Blocks, CeladonMansion5TextPointers, CeladonMansion5Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonMansion5Object ; objects
diff --git a/data/mapHeaders/celadonmart1.asm b/data/mapHeaders/celadonmart1.asm
deleted file mode 100755
index 12b013a4..00000000
--- a/data/mapHeaders/celadonmart1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonMart1_h:
-	db LOBBY ; tileset
-	db CELADON_MART_1_HEIGHT, CELADON_MART_1_WIDTH ; dimensions (y, x)
-	dw CeladonMart1Blocks, CeladonMart1TextPointers, CeladonMart1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonMart1Object ; objects
diff --git a/data/mapHeaders/celadonmart2.asm b/data/mapHeaders/celadonmart2.asm
deleted file mode 100755
index 210f85af..00000000
--- a/data/mapHeaders/celadonmart2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonMart2_h:
-	db LOBBY ; tileset
-	db CELADON_MART_2_HEIGHT, CELADON_MART_2_WIDTH ; dimensions (y, x)
-	dw CeladonMart2Blocks, CeladonMart2TextPointers, CeladonMart2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonMart2Object ; objects
diff --git a/data/mapHeaders/celadonmart3.asm b/data/mapHeaders/celadonmart3.asm
deleted file mode 100755
index 511b1405..00000000
--- a/data/mapHeaders/celadonmart3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonMart3_h:
-	db LOBBY ; tileset
-	db CELADON_MART_3_HEIGHT, CELADON_MART_3_WIDTH ; dimensions (y, x)
-	dw CeladonMart3Blocks, CeladonMart3TextPointers, CeladonMart3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonMart3Object ; objects
diff --git a/data/mapHeaders/celadonmart4.asm b/data/mapHeaders/celadonmart4.asm
deleted file mode 100755
index fd34406d..00000000
--- a/data/mapHeaders/celadonmart4.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonMart4_h:
-	db LOBBY ; tileset
-	db CELADON_MART_4_HEIGHT, CELADON_MART_4_WIDTH ; dimensions (y, x)
-	dw CeladonMart4Blocks, CeladonMart4TextPointers, CeladonMart4Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonMart4Object ; objects
diff --git a/data/mapHeaders/celadonmart5.asm b/data/mapHeaders/celadonmart5.asm
deleted file mode 100755
index 66e70f28..00000000
--- a/data/mapHeaders/celadonmart5.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonMart5_h:
-	db LOBBY ; tileset
-	db CELADON_MART_5_HEIGHT, CELADON_MART_5_WIDTH ; dimensions (y, x)
-	dw CeladonMart5Blocks, CeladonMart5TextPointers, CeladonMart5Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonMart5Object ; objects
diff --git a/data/mapHeaders/celadonmartelevator.asm b/data/mapHeaders/celadonmartelevator.asm
deleted file mode 100755
index 149e5b0f..00000000
--- a/data/mapHeaders/celadonmartelevator.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonMartElevator_h:
-	db LOBBY ; tileset
-	db CELADON_MART_ELEVATOR_HEIGHT, CELADON_MART_ELEVATOR_WIDTH ; dimensions (y, x)
-	dw CeladonMartElevatorBlocks, CeladonMartElevatorTextPointers, CeladonMartElevatorScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonMartElevatorObject ; objects
diff --git a/data/mapHeaders/celadonmartroof.asm b/data/mapHeaders/celadonmartroof.asm
deleted file mode 100755
index 2073afd2..00000000
--- a/data/mapHeaders/celadonmartroof.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonMartRoof_h:
-	db LOBBY ; tileset
-	db CELADON_MART_ROOF_HEIGHT, CELADON_MART_ROOF_WIDTH ; dimensions (y, x)
-	dw CeladonMartRoofBlocks, CeladonMartRoofTextPointers, CeladonMartRoofScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonMartRoofObject ; objects
diff --git a/data/mapHeaders/celadonpokecenter.asm b/data/mapHeaders/celadonpokecenter.asm
deleted file mode 100755
index bfeb76b7..00000000
--- a/data/mapHeaders/celadonpokecenter.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonPokecenter_h:
-	db POKECENTER ; tileset
-	db CELADON_POKECENTER_HEIGHT, CELADON_POKECENTER_WIDTH ; dimensions (y, x)
-	dw CeladonPokecenterBlocks, CeladonPokecenterTextPointers, CeladonPokecenterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonPokecenterObject ; objects
diff --git a/data/mapHeaders/celadonprizeroom.asm b/data/mapHeaders/celadonprizeroom.asm
deleted file mode 100755
index 83161b30..00000000
--- a/data/mapHeaders/celadonprizeroom.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeladonPrizeRoom_h:
-	db LOBBY ; tileset
-	db CELADON_PRIZE_ROOM_HEIGHT, CELADON_PRIZE_ROOM_WIDTH ; dimensions (y, x)
-	dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeladonPrizeRoomObject ; objects
diff --git a/data/mapHeaders/ceruleancity.asm b/data/mapHeaders/ceruleancity.asm
deleted file mode 100755
index be6dc5b2..00000000
--- a/data/mapHeaders/ceruleancity.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-CeruleanCity_h:
-	db OVERWORLD ; tileset
-	db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x)
-	dw CeruleanCityBlocks, CeruleanCityTextPointers, CeruleanCityScript ; blocks, texts, scripts
-	db NORTH | SOUTH | WEST | EAST ; connections
-	NORTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_24, 5, 0, Route24Blocks
-	SOUTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_5, 5, 0, Route5Blocks, 1
-	WEST_MAP_CONNECTION CERULEAN_CITY, ROUTE_4, 4, 0, Route4Blocks
-	EAST_MAP_CONNECTION CERULEAN_CITY, ROUTE_9, 4, 0, Route9Blocks
-	dw CeruleanCityObject ; objects
diff --git a/data/mapHeaders/ceruleangym.asm b/data/mapHeaders/ceruleangym.asm
deleted file mode 100755
index 3c4f8052..00000000
--- a/data/mapHeaders/ceruleangym.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeruleanGym_h:
-	db GYM ; tileset
-	db CERULEAN_GYM_HEIGHT, CERULEAN_GYM_WIDTH ; dimensions (y, x)
-	dw CeruleanGymBlocks, CeruleanGymTextPointers, CeruleanGymScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeruleanGymObject ; objects
diff --git a/data/mapHeaders/ceruleanhouse1.asm b/data/mapHeaders/ceruleanhouse1.asm
deleted file mode 100755
index fa12c61c..00000000
--- a/data/mapHeaders/ceruleanhouse1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeruleanHouse1_h:
-	db HOUSE ; tileset
-	db CERULEAN_HOUSE_1_HEIGHT, CERULEAN_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw CeruleanHouse1Blocks, CeruleanHouse1TextPointers, CeruleanHouse1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeruleanHouse1Object ; objects
diff --git a/data/mapHeaders/ceruleanhouse2.asm b/data/mapHeaders/ceruleanhouse2.asm
deleted file mode 100755
index 78f6d821..00000000
--- a/data/mapHeaders/ceruleanhouse2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeruleanHouse2_h:
-	db SHIP ; tileset
-	db CERULEAN_HOUSE_2_HEIGHT, CERULEAN_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw CeruleanHouse2Blocks, CeruleanHouse2TextPointers, CeruleanHouse2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeruleanHouse2Object ; objects
diff --git a/data/mapHeaders/ceruleanhousetrashed.asm b/data/mapHeaders/ceruleanhousetrashed.asm
deleted file mode 100755
index 53eaa581..00000000
--- a/data/mapHeaders/ceruleanhousetrashed.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeruleanHouseTrashed_h:
-	db HOUSE ; tileset
-	db TRASHED_HOUSE_HEIGHT, TRASHED_HOUSE_WIDTH ; dimensions (y, x)
-	dw CeruleanHouseTrashedBlocks, CeruleanHouseTrashedTextPointers, CeruleanHouseTrashedScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeruleanHouseTrashedObject ; objects
diff --git a/data/mapHeaders/ceruleanmart.asm b/data/mapHeaders/ceruleanmart.asm
deleted file mode 100755
index 12bafa98..00000000
--- a/data/mapHeaders/ceruleanmart.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeruleanMart_h:
-	db MART ; tileset
-	db CERULEAN_MART_HEIGHT, CERULEAN_MART_WIDTH ; dimensions (y, x)
-	dw CeruleanMartBlocks, CeruleanMartTextPointers, CeruleanMartScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeruleanMartObject ; objects
diff --git a/data/mapHeaders/ceruleanpokecenter.asm b/data/mapHeaders/ceruleanpokecenter.asm
deleted file mode 100755
index 41fcdd90..00000000
--- a/data/mapHeaders/ceruleanpokecenter.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CeruleanPokecenter_h:
-	db POKECENTER ; tileset
-	db CERULEAN_POKECENTER_HEIGHT, CERULEAN_POKECENTER_WIDTH ; dimensions (y, x)
-	dw CeruleanPokecenterBlocks, CeruleanPokecenterTextPointers, CeruleanPokecenterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CeruleanPokecenterObject ; objects
diff --git a/data/mapHeaders/cinnabargym.asm b/data/mapHeaders/cinnabargym.asm
deleted file mode 100755
index 2cb7dc74..00000000
--- a/data/mapHeaders/cinnabargym.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CinnabarGym_h:
-	db FACILITY ; tileset
-	db CINNABAR_GYM_HEIGHT, CINNABAR_GYM_WIDTH ; dimensions (y, x)
-	dw CinnabarGymBlocks, CinnabarGymTextPointers, CinnabarGymScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CinnabarGymObject ; objects
diff --git a/data/mapHeaders/cinnabarisland.asm b/data/mapHeaders/cinnabarisland.asm
deleted file mode 100755
index 6ae6424d..00000000
--- a/data/mapHeaders/cinnabarisland.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-CinnabarIsland_h:
-	db OVERWORLD ; tileset
-	db CINNABAR_ISLAND_HEIGHT, CINNABAR_ISLAND_WIDTH ; dimensions (y, x)
-	dw CinnabarIslandBlocks, CinnabarIslandTextPointers, CinnabarIslandScript ; blocks, texts, scripts
-	db NORTH | EAST ; connections
-	NORTH_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_21, 0, 0, Route21Blocks
-	EAST_MAP_CONNECTION CINNABAR_ISLAND, ROUTE_20, 0, 0, Route20Blocks
-	dw CinnabarIslandObject ; objects
diff --git a/data/mapHeaders/cinnabarmart.asm b/data/mapHeaders/cinnabarmart.asm
deleted file mode 100755
index e2c8437d..00000000
--- a/data/mapHeaders/cinnabarmart.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CinnabarMart_h:
-	db MART ; tileset
-	db CINNABAR_MART_HEIGHT, CINNABAR_MART_WIDTH ; dimensions (y, x)
-	dw CinnabarMartBlocks, CinnabarMartTextPointers, CinnabarMartScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CinnabarMartObject ; objects
diff --git a/data/mapHeaders/cinnabarpokecenter.asm b/data/mapHeaders/cinnabarpokecenter.asm
deleted file mode 100755
index a11a02f3..00000000
--- a/data/mapHeaders/cinnabarpokecenter.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CinnabarPokecenter_h:
-	db POKECENTER ; tileset
-	db CINNABAR_POKECENTER_HEIGHT, CINNABAR_POKECENTER_WIDTH ; dimensions (y, x)
-	dw CinnabarPokecenterBlocks, CinnabarPokecenterTextPointers, CinnabarPokecenterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CinnabarPokecenterObject ; objects
diff --git a/data/mapHeaders/colosseum.asm b/data/mapHeaders/colosseum.asm
deleted file mode 100755
index 13d9f0c4..00000000
--- a/data/mapHeaders/colosseum.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Colosseum_h:
-	db CLUB ; tileset
-	db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x)
-	dw ColosseumBlocks, ColosseumTextPointers, ColosseumScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw ColosseumObject ; objects
diff --git a/data/mapHeaders/copycatshouse1f.asm b/data/mapHeaders/copycatshouse1f.asm
deleted file mode 100755
index 7489eed7..00000000
--- a/data/mapHeaders/copycatshouse1f.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CopycatsHouse1F_h:
-	db REDS_HOUSE_1 ; tileset
-	db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x)
-	dw CopycatsHouse1FBlocks, CopycatsHouse1FTextPointers, CopycatsHouse1FScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CopycatsHouse1FObject ; objects
diff --git a/data/mapHeaders/copycatshouse2f.asm b/data/mapHeaders/copycatshouse2f.asm
deleted file mode 100755
index 7566143f..00000000
--- a/data/mapHeaders/copycatshouse2f.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-CopycatsHouse2F_h:
-	db REDS_HOUSE_2 ; tileset
-	db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x)
-	dw CopycatsHouse2FBlocks, CopycatsHouse2FTextPointers, CopycatsHouse2FScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw CopycatsHouse2FObject ; objects
diff --git a/data/mapHeaders/daycarem.asm b/data/mapHeaders/daycarem.asm
deleted file mode 100755
index b61a00f2..00000000
--- a/data/mapHeaders/daycarem.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-DayCareM_h:
-	db HOUSE ; tileset
-	db DAYCAREM_HEIGHT, DAYCAREM_WIDTH ; dimensions (y, x)
-	dw DayCareMBlocks, DayCareMTextPointers, DayCareMScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw DayCareMObject ; objects
diff --git a/data/mapHeaders/diglettscave.asm b/data/mapHeaders/diglettscave.asm
deleted file mode 100755
index 29c1db3e..00000000
--- a/data/mapHeaders/diglettscave.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-DiglettsCave_h:
-	db CAVERN ; tileset
-	db DIGLETTS_CAVE_HEIGHT, DIGLETTS_CAVE_WIDTH ; dimensions (y, x)
-	dw DiglettsCaveBlocks, DiglettsCaveTextPointers, DiglettsCaveScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw DiglettsCaveObject ; objects
diff --git a/data/mapHeaders/diglettscaveroute11.asm b/data/mapHeaders/diglettscaveroute11.asm
deleted file mode 100755
index bb3817ea..00000000
--- a/data/mapHeaders/diglettscaveroute11.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-DiglettsCaveEntranceRoute11_h:
-	db CAVERN ; tileset
-	db DIGLETTS_CAVE_ENTRANCE_HEIGHT, DIGLETTS_CAVE_ENTRANCE_WIDTH ; dimensions (y, x)
-	dw DiglettsCaveEntranceRoute11Blocks, DiglettsCaveEntranceRoute11TextPointers, DiglettsCaveEntranceRoute11Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw DiglettsCaveEntranceRoute11Object ; objects
diff --git a/data/mapHeaders/diglettscaveroute2.asm b/data/mapHeaders/diglettscaveroute2.asm
deleted file mode 100755
index 505fbbff..00000000
--- a/data/mapHeaders/diglettscaveroute2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-DiglettsCaveRoute2_h:
-	db CAVERN ; tileset
-	db DIGLETTS_CAVE_EXIT_HEIGHT, DIGLETTS_CAVE_EXIT_WIDTH ; dimensions (y, x)
-	dw DiglettsCaveRoute2Blocks, DiglettsCaveRoute2TextPointers, DiglettsCaveRoute2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw DiglettsCaveRoute2Object ; objects
diff --git a/data/mapHeaders/fanclub.asm b/data/mapHeaders/fanclub.asm
deleted file mode 100755
index 6b70e935..00000000
--- a/data/mapHeaders/fanclub.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-FanClub_h:
-	db INTERIOR ; tileset
-	db POKEMON_FAN_CLUB_HEIGHT, POKEMON_FAN_CLUB_WIDTH ; dimensions (y, x)
-	dw FanClubBlocks, FanClubTextPointers, FanClubScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw FanClubObject ; objects
diff --git a/data/mapHeaders/fightingdojo.asm b/data/mapHeaders/fightingdojo.asm
deleted file mode 100755
index 37f9437c..00000000
--- a/data/mapHeaders/fightingdojo.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-FightingDojo_h:
-	db DOJO ; tileset
-	db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x)
-	dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw FightingDojoObject ; objects
diff --git a/data/mapHeaders/fuchsiacity.asm b/data/mapHeaders/fuchsiacity.asm
deleted file mode 100755
index 2bfd2793..00000000
--- a/data/mapHeaders/fuchsiacity.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-FuchsiaCity_h:
-	db OVERWORLD ; tileset
-	db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x)
-	dw FuchsiaCityBlocks, FuchsiaCityTextPointers, FuchsiaCityScript ; blocks, texts, scripts
-	db SOUTH | WEST | EAST ; connections
-	SOUTH_MAP_CONNECTION FUCHSIA_CITY, ROUTE_19, 5, 0, Route19Blocks
-	WEST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_18, 4, 0, Route18Blocks
-	EAST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_15, 4, 0, Route15Blocks
-	dw FuchsiaCityObject ; objects
diff --git a/data/mapHeaders/fuchsiagym.asm b/data/mapHeaders/fuchsiagym.asm
deleted file mode 100755
index 9bad3a7f..00000000
--- a/data/mapHeaders/fuchsiagym.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-FuchsiaGym_h:
-	db GYM ; tileset
-	db FUCHSIA_GYM_HEIGHT, FUCHSIA_GYM_WIDTH ; dimensions (y, x)
-	dw FuchsiaGymBlocks, FuchsiaGymTextPointers, FuchsiaGymScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw FuchsiaGymObject ; objects
diff --git a/data/mapHeaders/fuchsiahouse1.asm b/data/mapHeaders/fuchsiahouse1.asm
deleted file mode 100755
index 7de94ad5..00000000
--- a/data/mapHeaders/fuchsiahouse1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-FuchsiaHouse1_h:
-	db HOUSE ; tileset
-	db FUCHSIA_HOUSE_1_HEIGHT, FUCHSIA_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw FuchsiaHouse1Blocks, FuchsiaHouse1TextPointers, FuchsiaHouse1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw FuchsiaHouse1Object ; objects
diff --git a/data/mapHeaders/fuchsiahouse2.asm b/data/mapHeaders/fuchsiahouse2.asm
deleted file mode 100755
index 7032f549..00000000
--- a/data/mapHeaders/fuchsiahouse2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-FuchsiaHouse2_h:
-	db LAB ; tileset
-	db FUCHSIA_HOUSE_2_HEIGHT, FUCHSIA_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw FuchsiaHouse2Blocks, FuchsiaHouse2TextPointers, FuchsiaHouse2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw FuchsiaHouse2Object ; objects
diff --git a/data/mapHeaders/fuchsiahouse3.asm b/data/mapHeaders/fuchsiahouse3.asm
deleted file mode 100755
index 01917145..00000000
--- a/data/mapHeaders/fuchsiahouse3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-FuchsiaHouse3_h:
-	db SHIP ; tileset
-	db FUCHSIA_HOUSE_3_HEIGHT, FUCHSIA_HOUSE_3_WIDTH ; dimensions (y, x)
-	dw FuchsiaHouse3Blocks, FuchsiaHouse3TextPointers, FuchsiaHouse3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw FuchsiaHouse3Object ; objects
diff --git a/data/mapHeaders/fuchsiamart.asm b/data/mapHeaders/fuchsiamart.asm
deleted file mode 100755
index c1445bc8..00000000
--- a/data/mapHeaders/fuchsiamart.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-FuchsiaMart_h:
-	db MART ; tileset
-	db FUCHSIA_MART_HEIGHT, FUCHSIA_MART_WIDTH ; dimensions (y, x)
-	dw FuchsiaMartBlocks, FuchsiaMartTextPointers, FuchsiaMartScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw FuchsiaMartObject ; objects
diff --git a/data/mapHeaders/fuchsiameetingroom.asm b/data/mapHeaders/fuchsiameetingroom.asm
deleted file mode 100755
index e7f31770..00000000
--- a/data/mapHeaders/fuchsiameetingroom.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-FuchsiaMeetingRoom_h:
-	db LAB ; tileset
-	db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x)
-	dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw FuchsiaMeetingRoomObject ; objects
diff --git a/data/mapHeaders/fuchsiapokecenter.asm b/data/mapHeaders/fuchsiapokecenter.asm
deleted file mode 100755
index 4625c980..00000000
--- a/data/mapHeaders/fuchsiapokecenter.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-FuchsiaPokecenter_h:
-	db POKECENTER ; tileset
-	db FUCHSIA_POKECENTER_HEIGHT, FUCHSIA_POKECENTER_WIDTH ; dimensions (y, x)
-	dw FuchsiaPokecenterBlocks, FuchsiaPokecenterTextPointers, FuchsiaPokecenterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw FuchsiaPokecenterObject ; objects
diff --git a/data/mapHeaders/gary.asm b/data/mapHeaders/gary.asm
deleted file mode 100755
index a9cf381b..00000000
--- a/data/mapHeaders/gary.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Gary_h:
-	db GYM ; tileset
-	db CHAMPIONS_ROOM_HEIGHT, CHAMPIONS_ROOM_WIDTH ; dimensions (y, x)
-	dw GaryBlocks, GaryTextPointers, GaryScript ; blocks, texts, scripts
-	db $0 ; connections
-	dw GaryObject ; objects
diff --git a/data/mapHeaders/halloffameroom.asm b/data/mapHeaders/halloffameroom.asm
deleted file mode 100755
index 9c06c434..00000000
--- a/data/mapHeaders/halloffameroom.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-HallofFameRoom_h:
-	db GYM ; tileset
-	db HALL_OF_FAME_HEIGHT, HALL_OF_FAME_WIDTH ; dimensions (y, x)
-	dw HallofFameRoomBlocks, HallofFameRoomTextPointers, HallofFameRoomScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw HallofFameRoomObject ; objects
diff --git a/data/mapHeaders/indigoplateau.asm b/data/mapHeaders/indigoplateau.asm
deleted file mode 100755
index deaf5041..00000000
--- a/data/mapHeaders/indigoplateau.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-IndigoPlateau_h:
-	db PLATEAU ; tileset
-	db INDIGO_PLATEAU_HEIGHT, INDIGO_PLATEAU_WIDTH ; dimensions (y, x)
-	dw IndigoPlateauBlocks, IndigoPlateauTextPointers, IndigoPlateauScript ; blocks, texts, scripts
-	db SOUTH ; connections
-	SOUTH_MAP_CONNECTION INDIGO_PLATEAU, ROUTE_23, 0, 0, Route23Blocks
-	dw IndigoPlateauObject ; objects
diff --git a/data/mapHeaders/indigoplateaulobby.asm b/data/mapHeaders/indigoplateaulobby.asm
deleted file mode 100755
index 67153dbc..00000000
--- a/data/mapHeaders/indigoplateaulobby.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-IndigoPlateauLobby_h:
-	db MART ; tileset
-	db INDIGO_PLATEAU_LOBBY_HEIGHT, INDIGO_PLATEAU_LOBBY_WIDTH ; dimensions (y, x)
-	dw IndigoPlateauLobbyBlocks, IndigoPlateauLobbyTextPointers, IndigoPlateauLobbyScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw IndigoPlateauLobbyObject ; objects
diff --git a/data/mapHeaders/lab1.asm b/data/mapHeaders/lab1.asm
deleted file mode 100755
index d4d04e3d..00000000
--- a/data/mapHeaders/lab1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Lab1_h:
-	db LAB ; tileset
-	db CINNABAR_LAB_1_HEIGHT, CINNABAR_LAB_1_WIDTH ; dimensions (y, x)
-	dw Lab1Blocks, Lab1TextPointers, Lab1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw Lab1Object ; objects
diff --git a/data/mapHeaders/lab2.asm b/data/mapHeaders/lab2.asm
deleted file mode 100755
index 3d264741..00000000
--- a/data/mapHeaders/lab2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Lab2_h:
-	db LAB ; tileset
-	db CINNABAR_LAB_2_HEIGHT, CINNABAR_LAB_2_WIDTH ; dimensions (y, x)
-	dw Lab2Blocks, Lab2TextPointers, Lab2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw Lab2Object ; objects
diff --git a/data/mapHeaders/lab3.asm b/data/mapHeaders/lab3.asm
deleted file mode 100755
index 0f401f65..00000000
--- a/data/mapHeaders/lab3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Lab3_h:
-	db LAB ; tileset
-	db CINNABAR_LAB_3_HEIGHT, CINNABAR_LAB_3_WIDTH ; dimensions (y, x)
-	dw Lab3Blocks, Lab3TextPointers, Lab3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw Lab3Object ; objects
diff --git a/data/mapHeaders/lab4.asm b/data/mapHeaders/lab4.asm
deleted file mode 100755
index 10ded376..00000000
--- a/data/mapHeaders/lab4.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Lab4_h:
-	db LAB ; tileset
-	db CINNABAR_LAB_4_HEIGHT, CINNABAR_LAB_4_WIDTH ; dimensions (y, x)
-	dw Lab4Blocks, Lab4TextPointers, Lab4Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw Lab4Object ; objects
diff --git a/data/mapHeaders/lance.asm b/data/mapHeaders/lance.asm
deleted file mode 100755
index d9a1ae75..00000000
--- a/data/mapHeaders/lance.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Lance_h:
-	db DOJO ; tileset
-	db LANCES_ROOM_HEIGHT, LANCES_ROOM_WIDTH ; dimensions (y, x)
-	dw LanceBlocks, LanceTextPointers, LanceScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw LanceObject ; objects
diff --git a/data/mapHeaders/lavenderhouse1.asm b/data/mapHeaders/lavenderhouse1.asm
deleted file mode 100755
index 362e4359..00000000
--- a/data/mapHeaders/lavenderhouse1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-LavenderHouse1_h:
-	db HOUSE ; tileset
-	db LAVENDER_HOUSE_1_HEIGHT, LAVENDER_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw LavenderHouse1Blocks, LavenderHouse1TextPointers, LavenderHouse1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw LavenderHouse1Object ; objects
diff --git a/data/mapHeaders/lavenderhouse2.asm b/data/mapHeaders/lavenderhouse2.asm
deleted file mode 100755
index 971e1e8d..00000000
--- a/data/mapHeaders/lavenderhouse2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-LavenderHouse2_h:
-	db HOUSE ; tileset
-	db LAVENDER_HOUSE_2_HEIGHT, LAVENDER_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw LavenderHouse2Blocks, LavenderHouse2TextPointers, LavenderHouse2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw LavenderHouse2Object ; objects
diff --git a/data/mapHeaders/lavendermart.asm b/data/mapHeaders/lavendermart.asm
deleted file mode 100755
index 13cb06c5..00000000
--- a/data/mapHeaders/lavendermart.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-LavenderMart_h:
-	db MART ; tileset
-	db LAVENDER_MART_HEIGHT, LAVENDER_MART_WIDTH ; dimensions (y, x)
-	dw LavenderMartBlocks, LavenderMartTextPointers, LavenderMartScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw LavenderMartObject ; objects
diff --git a/data/mapHeaders/lavenderpokecenter.asm b/data/mapHeaders/lavenderpokecenter.asm
deleted file mode 100755
index ce9650f1..00000000
--- a/data/mapHeaders/lavenderpokecenter.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-LavenderPokecenter_h:
-	db POKECENTER ; tileset
-	db LAVENDER_POKECENTER_HEIGHT, LAVENDER_POKECENTER_WIDTH ; dimensions (y, x)
-	dw LavenderPokecenterBlocks, LavenderPokecenterTextPointers, LavenderPokecenterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw LavenderPokecenterObject ; objects
diff --git a/data/mapHeaders/lavendertown.asm b/data/mapHeaders/lavendertown.asm
deleted file mode 100755
index 74bbd7a8..00000000
--- a/data/mapHeaders/lavendertown.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-LavenderTown_h:
-	db OVERWORLD ; tileset
-	db LAVENDER_TOWN_HEIGHT, LAVENDER_TOWN_WIDTH ; dimensions (y, x)
-	dw LavenderTownBlocks, LavenderTownTextPointers, LavenderTownScript ; blocks, texts, scripts
-	db NORTH | SOUTH | WEST ; connections
-	NORTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_10, 0, 0, Route10Blocks
-	SOUTH_MAP_CONNECTION LAVENDER_TOWN, ROUTE_12, 0, 0, Route12Blocks, 1
-	WEST_MAP_CONNECTION LAVENDER_TOWN, ROUTE_8, 0, 0, Route8Blocks
-	dw LavenderTownObject ; objects
diff --git a/data/mapHeaders/lorelei.asm b/data/mapHeaders/lorelei.asm
deleted file mode 100755
index 82efe164..00000000
--- a/data/mapHeaders/lorelei.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Lorelei_h:
-	db GYM ; tileset
-	db LORELEIS_ROOM_HEIGHT, LORELEIS_ROOM_WIDTH ; dimensions (y, x)
-	dw LoreleiBlocks, LoreleiTextPointers, LoreleiScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw LoreleiObject ; objects
diff --git a/data/mapHeaders/mansion1.asm b/data/mapHeaders/mansion1.asm
deleted file mode 100755
index 8b326941..00000000
--- a/data/mapHeaders/mansion1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Mansion1_h:
-	db FACILITY ; tileset
-	db MANSION_1_HEIGHT, MANSION_1_WIDTH ; dimensions (y, x)
-	dw Mansion1Blocks, Mansion1TextPointers, Mansion1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw Mansion1Object ; objects
diff --git a/data/mapHeaders/mansion2.asm b/data/mapHeaders/mansion2.asm
deleted file mode 100755
index fba95ed8..00000000
--- a/data/mapHeaders/mansion2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Mansion2_h:
-	db FACILITY ; tileset
-	db MANSION_2_HEIGHT, MANSION_2_WIDTH ; dimensions (y, x)
-	dw Mansion2Blocks, Mansion2TextPointers, Mansion2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw Mansion2Object ; objects
diff --git a/data/mapHeaders/mansion3.asm b/data/mapHeaders/mansion3.asm
deleted file mode 100755
index 933d4c6f..00000000
--- a/data/mapHeaders/mansion3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Mansion3_h:
-	db FACILITY ; tileset
-	db MANSION_3_HEIGHT, MANSION_3_WIDTH ; dimensions (y, x)
-	dw Mansion3Blocks, Mansion3TextPointers, Mansion3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw Mansion3Object ; objects
diff --git a/data/mapHeaders/mansion4.asm b/data/mapHeaders/mansion4.asm
deleted file mode 100755
index 806b66b6..00000000
--- a/data/mapHeaders/mansion4.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Mansion4_h:
-	db FACILITY ; tileset
-	db MANSION_4_HEIGHT, MANSION_4_WIDTH ; dimensions (y, x)
-	dw Mansion4Blocks, Mansion4TextPointers, Mansion4Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw Mansion4Object ; objects
diff --git a/data/mapHeaders/mtmoon1.asm b/data/mapHeaders/mtmoon1.asm
deleted file mode 100755
index 4fbd8de0..00000000
--- a/data/mapHeaders/mtmoon1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-MtMoon1_h:
-	db CAVERN ; tileset
-	db MT_MOON_1_HEIGHT, MT_MOON_1_WIDTH ; dimensions (y, x)
-	dw MtMoon1Blocks, MtMoon1TextPointers, MtMoon1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw MtMoon1Object ; objects
diff --git a/data/mapHeaders/mtmoon2.asm b/data/mapHeaders/mtmoon2.asm
deleted file mode 100755
index 81b0b365..00000000
--- a/data/mapHeaders/mtmoon2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-MtMoon2_h:
-	db CAVERN ; tileset
-	db MT_MOON_2_HEIGHT, MT_MOON_2_WIDTH ; dimensions (y, x)
-	dw MtMoon2Blocks, MtMoon2TextPointers, MtMoon2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw MtMoon2Object ; objects
diff --git a/data/mapHeaders/mtmoon3.asm b/data/mapHeaders/mtmoon3.asm
deleted file mode 100755
index f89d77cb..00000000
--- a/data/mapHeaders/mtmoon3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-MtMoon3_h:
-	db CAVERN ; tileset
-	db MT_MOON_3_HEIGHT, MT_MOON_3_WIDTH ; dimensions (y, x)
-	dw MtMoon3Blocks, MtMoon3TextPointers, MtMoon3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw MtMoon3Object ; objects
diff --git a/data/mapHeaders/mtmoonpokecenter.asm b/data/mapHeaders/mtmoonpokecenter.asm
deleted file mode 100755
index 0cb1791b..00000000
--- a/data/mapHeaders/mtmoonpokecenter.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-MtMoonPokecenter_h:
-	db POKECENTER ; tileset
-	db MT_MOON_POKECENTER_HEIGHT, MT_MOON_POKECENTER_WIDTH ; dimensions (y, x)
-	dw MtMoonPokecenterBlocks, MtMoonPokecenterTextPointers, MtMoonPokecenterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw MtMoonPokecenterObject ; objects
diff --git a/data/mapHeaders/museum1f.asm b/data/mapHeaders/museum1f.asm
deleted file mode 100755
index eca97706..00000000
--- a/data/mapHeaders/museum1f.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Museum1F_h:
-	db MUSEUM ; tileset
-	db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x)
-	dw Museum1FBlocks, Museum1FTextPointers, Museum1FScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Museum1FObject ; objects
diff --git a/data/mapHeaders/museum2f.asm b/data/mapHeaders/museum2f.asm
deleted file mode 100755
index 973f5045..00000000
--- a/data/mapHeaders/museum2f.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Museum2F_h:
-	db MUSEUM ; tileset
-	db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x)
-	dw Museum2FBlocks, Museum2FTextPointers, Museum2FScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Museum2FObject ; objects
diff --git a/data/mapHeaders/namerater.asm b/data/mapHeaders/namerater.asm
deleted file mode 100755
index 01a488a7..00000000
--- a/data/mapHeaders/namerater.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-NameRater_h:
-	db HOUSE ; tileset
-	db NAME_RATERS_HOUSE_HEIGHT, NAME_RATERS_HOUSE_WIDTH ; dimensions (y, x)
-	dw NameRaterBlocks, NameRaterTextPointers, NameRaterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw NameRaterObject ; objects
diff --git a/data/mapHeaders/oakslab.asm b/data/mapHeaders/oakslab.asm
deleted file mode 100755
index 94608ef2..00000000
--- a/data/mapHeaders/oakslab.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-OaksLab_h:
-	db DOJO ; tileset
-	db OAKS_LAB_HEIGHT, OAKS_LAB_WIDTH ; dimensions (y, x)
-	dw OaksLabBlocks, OaksLabTextPointers, OaksLabScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw OaksLabObject ; objects
diff --git a/data/mapHeaders/pallettown.asm b/data/mapHeaders/pallettown.asm
deleted file mode 100755
index 8b8137ce..00000000
--- a/data/mapHeaders/pallettown.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PalletTown_h:
-	db OVERWORLD ; tileset
-	db PALLET_TOWN_HEIGHT, PALLET_TOWN_WIDTH ; dimensions (y, x)
-	dw PalletTownBlocks, PalletTownTextPointers, PalletTownScript ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION PALLET_TOWN, ROUTE_1, 0, 0, Route1Blocks
-	SOUTH_MAP_CONNECTION PALLET_TOWN, ROUTE_21, 0, 0, Route21Blocks, 1
-	dw PalletTownObject ; objects
diff --git a/data/mapHeaders/pewtercity.asm b/data/mapHeaders/pewtercity.asm
deleted file mode 100755
index 88faaacc..00000000
--- a/data/mapHeaders/pewtercity.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-PewterCity_h:
-	db OVERWORLD ; tileset
-	db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x)
-	dw PewterCityBlocks, PewterCityTextPointers, PewterCityScript ; blocks, texts, scripts
-	db SOUTH | EAST ; connections
-	SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2Blocks
-	EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3Blocks
-	dw PewterCityObject ; objects
diff --git a/data/mapHeaders/pewtergym.asm b/data/mapHeaders/pewtergym.asm
deleted file mode 100755
index a335ab50..00000000
--- a/data/mapHeaders/pewtergym.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-PewterGym_h:
-	db GYM ; tileset
-	db PEWTER_GYM_HEIGHT, PEWTER_GYM_WIDTH ; dimensions (y, x)
-	dw PewterGymBlocks, PewterGymTextPointers, PewterGymScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw PewterGymObject ; objects
diff --git a/data/mapHeaders/pewterhouse1.asm b/data/mapHeaders/pewterhouse1.asm
deleted file mode 100755
index 90b69d00..00000000
--- a/data/mapHeaders/pewterhouse1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-PewterHouse1_h:
-	db HOUSE ; tileset
-	db PEWTER_HOUSE_1_HEIGHT, PEWTER_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw PewterHouse1Blocks, PewterHouse1TextPointers, PewterHouse1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw PewterHouse1Object ; objects
diff --git a/data/mapHeaders/pewterhouse2.asm b/data/mapHeaders/pewterhouse2.asm
deleted file mode 100755
index 9baa3d41..00000000
--- a/data/mapHeaders/pewterhouse2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-PewterHouse2_h:
-	db HOUSE ; tileset
-	db PEWTER_HOUSE_2_HEIGHT, PEWTER_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw PewterHouse2Blocks, PewterHouse2TextPointers, PewterHouse2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw PewterHouse2Object ; objects
diff --git a/data/mapHeaders/pewtermart.asm b/data/mapHeaders/pewtermart.asm
deleted file mode 100755
index 00b91247..00000000
--- a/data/mapHeaders/pewtermart.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-PewterMart_h:
-	db MART ; tileset
-	db PEWTER_MART_HEIGHT, PEWTER_MART_WIDTH ; dimensions (y, x)
-	dw PewterMartBlocks, PewterMartTextPointers, PewterMartScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw PewterMartObject ; objects
diff --git a/data/mapHeaders/pewterpokecenter.asm b/data/mapHeaders/pewterpokecenter.asm
deleted file mode 100755
index 29851a96..00000000
--- a/data/mapHeaders/pewterpokecenter.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-PewterPokecenter_h:
-	db POKECENTER ; tileset
-	db PEWTER_POKECENTER_HEIGHT, PEWTER_POKECENTER_WIDTH ; dimensions (y, x)
-	dw PewterPokecenterBlocks, PewterPokecenterTextPointers, PewterPokecenterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw PewterPokecenterObject ; objects
diff --git a/data/mapHeaders/pokemontower1.asm b/data/mapHeaders/pokemontower1.asm
deleted file mode 100755
index 5ea76d21..00000000
--- a/data/mapHeaders/pokemontower1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-PokemonTower1_h:
-	db CEMETERY ; tileset
-	db POKEMONTOWER_1_HEIGHT, POKEMONTOWER_1_WIDTH ; dimensions (y, x)
-	dw PokemonTower1Blocks, PokemonTower1TextPointers, PokemonTower1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw PokemonTower1Object ; objects
diff --git a/data/mapHeaders/pokemontower2.asm b/data/mapHeaders/pokemontower2.asm
deleted file mode 100755
index 3da497e4..00000000
--- a/data/mapHeaders/pokemontower2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-PokemonTower2_h:
-	db CEMETERY ; tileset
-	db POKEMONTOWER_2_HEIGHT, POKEMONTOWER_2_WIDTH ; dimensions (y, x)
-	dw PokemonTower2Blocks, PokemonTower2TextPointers, PokemonTower2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw PokemonTower2Object ; objects
diff --git a/data/mapHeaders/pokemontower3.asm b/data/mapHeaders/pokemontower3.asm
deleted file mode 100755
index bec35122..00000000
--- a/data/mapHeaders/pokemontower3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-PokemonTower3_h:
-	db CEMETERY ; tileset
-	db POKEMONTOWER_3_HEIGHT, POKEMONTOWER_3_WIDTH ; dimensions (y, x)
-	dw PokemonTower3Blocks, PokemonTower3TextPointers, PokemonTower3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw PokemonTower3Object ; objects
diff --git a/data/mapHeaders/pokemontower4.asm b/data/mapHeaders/pokemontower4.asm
deleted file mode 100755
index 4d96c709..00000000
--- a/data/mapHeaders/pokemontower4.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-PokemonTower4_h:
-	db CEMETERY ; tileset
-	db POKEMONTOWER_4_HEIGHT, POKEMONTOWER_4_WIDTH ; dimensions (y, x)
-	dw PokemonTower4Blocks, PokemonTower4TextPointers, PokemonTower4Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw PokemonTower4Object ; objects
diff --git a/data/mapHeaders/pokemontower5.asm b/data/mapHeaders/pokemontower5.asm
deleted file mode 100755
index f91911b0..00000000
--- a/data/mapHeaders/pokemontower5.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-PokemonTower5_h:
-	db CEMETERY ; tileset
-	db POKEMONTOWER_5_HEIGHT, POKEMONTOWER_5_WIDTH ; dimensions (y, x)
-	dw PokemonTower5Blocks, PokemonTower5TextPointers, PokemonTower5Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw PokemonTower5Object ; objects
diff --git a/data/mapHeaders/pokemontower6.asm b/data/mapHeaders/pokemontower6.asm
deleted file mode 100755
index 10a54cd5..00000000
--- a/data/mapHeaders/pokemontower6.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-PokemonTower6_h:
-	db CEMETERY ; tileset
-	db POKEMONTOWER_6_HEIGHT, POKEMONTOWER_6_WIDTH ; dimensions (y, x)
-	dw PokemonTower6Blocks, PokemonTower6TextPointers, PokemonTower6Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw PokemonTower6Object ; objects
diff --git a/data/mapHeaders/pokemontower7.asm b/data/mapHeaders/pokemontower7.asm
deleted file mode 100755
index b69fd01e..00000000
--- a/data/mapHeaders/pokemontower7.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-PokemonTower7_h:
-	db CEMETERY ; tileset
-	db POKEMONTOWER_7_HEIGHT, POKEMONTOWER_7_WIDTH ; dimensions (y, x)
-	dw PokemonTower7Blocks, PokemonTower7TextPointers, PokemonTower7Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw PokemonTower7Object ; objects
diff --git a/data/mapHeaders/powerplant.asm b/data/mapHeaders/powerplant.asm
deleted file mode 100755
index 3b13491d..00000000
--- a/data/mapHeaders/powerplant.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-PowerPlant_h:
-	db FACILITY ; tileset
-	db POWER_PLANT_HEIGHT, POWER_PLANT_WIDTH ; dimensions (y, x)
-	dw PowerPlantBlocks, PowerPlantTextPointers, PowerPlantScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw PowerPlantObject ; objects
diff --git a/data/mapHeaders/redshouse1f.asm b/data/mapHeaders/redshouse1f.asm
deleted file mode 100755
index a6f5783f..00000000
--- a/data/mapHeaders/redshouse1f.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-RedsHouse1F_h:
-	db REDS_HOUSE_1 ; tileset
-	db REDS_HOUSE_1F_HEIGHT, REDS_HOUSE_1F_WIDTH ; dimensions (y, x)
-	dw RedsHouse1FBlocks, RedsHouse1FTextPointers, RedsHouse1FScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw RedsHouse1FObject ; objects
diff --git a/data/mapHeaders/redshouse2f.asm b/data/mapHeaders/redshouse2f.asm
deleted file mode 100755
index 89193e9e..00000000
--- a/data/mapHeaders/redshouse2f.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-RedsHouse2F_h:
-	db REDS_HOUSE_2 ; tileset
-	db REDS_HOUSE_2F_HEIGHT, REDS_HOUSE_2F_WIDTH ; dimensions (y, x)
-	dw RedsHouse2FBlocks, RedsHouse2FTextPointers, RedsHouse2FScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw RedsHouse2FObject ; objects
diff --git a/data/mapHeaders/rockethideout1.asm b/data/mapHeaders/rockethideout1.asm
deleted file mode 100755
index bbe721ab..00000000
--- a/data/mapHeaders/rockethideout1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-RocketHideout1_h:
-	db FACILITY ; tileset
-	db ROCKET_HIDEOUT_1_HEIGHT, ROCKET_HIDEOUT_1_WIDTH ; dimensions (y, x)
-	dw RocketHideout1Blocks, RocketHideout1TextPointers, RocketHideout1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw RocketHideout1Object ; objects
diff --git a/data/mapHeaders/rockethideout2.asm b/data/mapHeaders/rockethideout2.asm
deleted file mode 100755
index cc2ed948..00000000
--- a/data/mapHeaders/rockethideout2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-RocketHideout2_h:
-	db FACILITY ; tileset
-	db ROCKET_HIDEOUT_2_HEIGHT, ROCKET_HIDEOUT_2_WIDTH ; dimensions (y, x)
-	dw RocketHideout2Blocks, RocketHideout2TextPointers, RocketHideout2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw RocketHideout2Object ; objects
diff --git a/data/mapHeaders/rockethideout3.asm b/data/mapHeaders/rockethideout3.asm
deleted file mode 100755
index 12e9aa1e..00000000
--- a/data/mapHeaders/rockethideout3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-RocketHideout3_h:
-	db FACILITY ; tileset
-	db ROCKET_HIDEOUT_3_HEIGHT, ROCKET_HIDEOUT_3_WIDTH ; dimensions (y, x)
-	dw RocketHideout3Blocks, RocketHideout3TextPointers, RocketHideout3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw RocketHideout3Object ; objects
diff --git a/data/mapHeaders/rockethideout4.asm b/data/mapHeaders/rockethideout4.asm
deleted file mode 100755
index 0b858dc9..00000000
--- a/data/mapHeaders/rockethideout4.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-RocketHideout4_h:
-	db FACILITY ; tileset
-	db ROCKET_HIDEOUT_4_HEIGHT, ROCKET_HIDEOUT_4_WIDTH ; dimensions (y, x)
-	dw RocketHideout4Blocks, RocketHideout4TextPointers, RocketHideout4Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw RocketHideout4Object ; objects
diff --git a/data/mapHeaders/rockethideoutelevator.asm b/data/mapHeaders/rockethideoutelevator.asm
deleted file mode 100755
index b4269444..00000000
--- a/data/mapHeaders/rockethideoutelevator.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-RocketHideoutElevator_h:
-	db LOBBY ; tileset
-	db ROCKET_HIDEOUT_ELEVATOR_HEIGHT, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; dimensions (y, x)
-	dw RocketHideoutElevatorBlocks, RocketHideoutElevatorTextPointers, RocketHideoutElevatorScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw RocketHideoutElevatorObject ; objects
diff --git a/data/mapHeaders/rocktunnel1.asm b/data/mapHeaders/rocktunnel1.asm
deleted file mode 100755
index 14fc41b1..00000000
--- a/data/mapHeaders/rocktunnel1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-RockTunnel1_h:
-	db CAVERN ; tileset
-	db ROCK_TUNNEL_1_HEIGHT, ROCK_TUNNEL_1_WIDTH ; dimensions (y, x)
-	dw RockTunnel1Blocks, RockTunnel1TextPointers, RockTunnel1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw RockTunnel1Object ; objects
diff --git a/data/mapHeaders/rocktunnel2.asm b/data/mapHeaders/rocktunnel2.asm
deleted file mode 100755
index c4184b8d..00000000
--- a/data/mapHeaders/rocktunnel2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-RockTunnel2_h:
-	db CAVERN ; tileset
-	db ROCK_TUNNEL_2_HEIGHT, ROCK_TUNNEL_2_WIDTH ; dimensions (y, x)
-	dw RockTunnel2Blocks, RockTunnel2TextPointers, RockTunnel2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw RockTunnel2Object ; objects
diff --git a/data/mapHeaders/rocktunnelpokecenter.asm b/data/mapHeaders/rocktunnelpokecenter.asm
deleted file mode 100755
index 977dd1cf..00000000
--- a/data/mapHeaders/rocktunnelpokecenter.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-RockTunnelPokecenter_h:
-	db POKECENTER ; tileset
-	db ROCK_TUNNEL_POKECENTER_HEIGHT, ROCK_TUNNEL_POKECENTER_WIDTH ; dimensions (y, x)
-	dw RockTunnelPokecenterBlocks, RockTunnelPokecenterTextPointers, RockTunnelPokecenterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw RockTunnelPokecenterObject ; objects
diff --git a/data/mapHeaders/route1.asm b/data/mapHeaders/route1.asm
deleted file mode 100755
index 5f6a858e..00000000
--- a/data/mapHeaders/route1.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route1_h:
-	db OVERWORLD ; tileset
-	db ROUTE_1_HEIGHT, ROUTE_1_WIDTH ; dimensions (y, x)
-	dw Route1Blocks, Route1TextPointers, Route1Script ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_1, VIRIDIAN_CITY, -3, 2, ViridianCityBlocks
-	SOUTH_MAP_CONNECTION ROUTE_1, PALLET_TOWN, 0, 0, PalletTownBlocks, 1
-	dw Route1Object ; objects
diff --git a/data/mapHeaders/route10.asm b/data/mapHeaders/route10.asm
deleted file mode 100755
index 7ee588cf..00000000
--- a/data/mapHeaders/route10.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route10_h:
-	db OVERWORLD ; tileset
-	db ROUTE_10_HEIGHT, ROUTE_10_WIDTH ; dimensions (y, x)
-	dw Route10Blocks, Route10TextPointers, Route10Script ; blocks, texts, scripts
-	db SOUTH | WEST ; connections
-	SOUTH_MAP_CONNECTION ROUTE_10, LAVENDER_TOWN, 0, 0, LavenderTownBlocks
-	WEST_MAP_CONNECTION ROUTE_10, ROUTE_9, 0, 0, Route9Blocks
-	dw Route10Object ; objects
diff --git a/data/mapHeaders/route11.asm b/data/mapHeaders/route11.asm
deleted file mode 100755
index 04ae8f24..00000000
--- a/data/mapHeaders/route11.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route11_h:
-	db OVERWORLD ; tileset
-	db ROUTE_11_HEIGHT, ROUTE_11_WIDTH ; dimensions (y, x)
-	dw Route11Blocks, Route11TextPointers, Route11Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_11, VERMILION_CITY, -3, 1, VermilionCityBlocks
-	EAST_MAP_CONNECTION ROUTE_11, ROUTE_12, -3, 24, Route12Blocks, 1
-	dw Route11Object ; objects
diff --git a/data/mapHeaders/route11gate.asm b/data/mapHeaders/route11gate.asm
deleted file mode 100755
index 22f90adb..00000000
--- a/data/mapHeaders/route11gate.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route11Gate_h:
-	db GATE ; tileset
-	db ROUTE_11_GATE_1F_HEIGHT, ROUTE_11_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route11GateBlocks, Route11GateTextPointers, Route11GateScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route11GateObject ; objects
diff --git a/data/mapHeaders/route11gateupstairs.asm b/data/mapHeaders/route11gateupstairs.asm
deleted file mode 100755
index d3f4a3e1..00000000
--- a/data/mapHeaders/route11gateupstairs.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route11GateUpstairs_h:
-	db GATE ; tileset
-	db ROUTE_11_GATE_2F_HEIGHT, ROUTE_11_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route11GateUpstairsBlocks, Route11GateUpstairsTextPointers, Route11GateUpstairsScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route11GateUpstairsObject ; objects
diff --git a/data/mapHeaders/route12.asm b/data/mapHeaders/route12.asm
deleted file mode 100755
index b11e0128..00000000
--- a/data/mapHeaders/route12.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-Route12_h:
-	db OVERWORLD ; tileset
-	db ROUTE_12_HEIGHT, ROUTE_12_WIDTH ; dimensions (y, x)
-	dw Route12Blocks, Route12TextPointers, Route12Script ; blocks, texts, scripts
-	db NORTH | SOUTH | WEST ; connections
-	NORTH_MAP_CONNECTION ROUTE_12, LAVENDER_TOWN, 0, 0, LavenderTownBlocks
-	SOUTH_MAP_CONNECTION ROUTE_12, ROUTE_13, -3, 17, Route13Blocks
-	WEST_MAP_CONNECTION ROUTE_12, ROUTE_11, 27, 0, Route11Blocks
-	dw Route12Object ; objects
diff --git a/data/mapHeaders/route12gate.asm b/data/mapHeaders/route12gate.asm
deleted file mode 100755
index a870a191..00000000
--- a/data/mapHeaders/route12gate.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route12Gate_h:
-	db GATE ; tileset
-	db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route12GateObject ; objects
diff --git a/data/mapHeaders/route12gateupstairs.asm b/data/mapHeaders/route12gateupstairs.asm
deleted file mode 100755
index 767cb764..00000000
--- a/data/mapHeaders/route12gateupstairs.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route12GateUpstairs_h:
-	db GATE ; tileset
-	db ROUTE_12_GATE_2F_HEIGHT, ROUTE_12_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route12GateUpstairsBlocks, Route12GateUpstairsTextPointers, Route12GateUpstairsScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route12GateUpstairsObject ; objects
diff --git a/data/mapHeaders/route12house.asm b/data/mapHeaders/route12house.asm
deleted file mode 100755
index 48428b10..00000000
--- a/data/mapHeaders/route12house.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route12House_h:
-	db HOUSE ; tileset
-	db ROUTE_12_HOUSE_HEIGHT, ROUTE_12_HOUSE_WIDTH ; dimensions (y, x)
-	dw Route12HouseBlocks, Route12HouseTextPointers, Route12HouseScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route12HouseObject ; objects
diff --git a/data/mapHeaders/route13.asm b/data/mapHeaders/route13.asm
deleted file mode 100755
index 53a88633..00000000
--- a/data/mapHeaders/route13.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route13_h:
-	db OVERWORLD ; tileset
-	db ROUTE_13_HEIGHT, ROUTE_13_WIDTH ; dimensions (y, x)
-	dw Route13Blocks, Route13TextPointers, Route13Script ; blocks, texts, scripts
-	db NORTH | WEST ; connections
-	NORTH_MAP_CONNECTION ROUTE_13, ROUTE_12, 20, 0, Route12Blocks
-	WEST_MAP_CONNECTION ROUTE_13, ROUTE_14, 0, 0, Route14Blocks
-	dw Route13Object ; objects
diff --git a/data/mapHeaders/route14.asm b/data/mapHeaders/route14.asm
deleted file mode 100755
index f860d332..00000000
--- a/data/mapHeaders/route14.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route14_h:
-	db OVERWORLD ; tileset
-	db ROUTE_14_HEIGHT, ROUTE_14_WIDTH ; dimensions (y, x)
-	dw Route14Blocks, Route14TextPointers, Route14Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_14, ROUTE_15, 18, 0, Route15Blocks
-	EAST_MAP_CONNECTION ROUTE_14, ROUTE_13, 0, 0, Route13Blocks
-	dw Route14Object ; objects
diff --git a/data/mapHeaders/route15.asm b/data/mapHeaders/route15.asm
deleted file mode 100755
index 48d5ff20..00000000
--- a/data/mapHeaders/route15.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route15_h:
-	db OVERWORLD ; tileset
-	db ROUTE_15_HEIGHT, ROUTE_15_WIDTH ; dimensions (y, x)
-	dw Route15Blocks, Route15TextPointers, Route15Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_15, FUCHSIA_CITY, -3, 1, FuchsiaCityBlocks
-	EAST_MAP_CONNECTION ROUTE_15, ROUTE_14, -3, 15, Route14Blocks
-	dw Route15Object ; objects
diff --git a/data/mapHeaders/route15gate.asm b/data/mapHeaders/route15gate.asm
deleted file mode 100755
index ae71bc35..00000000
--- a/data/mapHeaders/route15gate.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route15Gate_h:
-	db GATE ; tileset
-	db ROUTE_15_GATE_1F_HEIGHT, ROUTE_15_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route15GateBlocks, Route15GateTextPointers, Route15GateScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route15GateObject ; objects
diff --git a/data/mapHeaders/route15gateupstairs.asm b/data/mapHeaders/route15gateupstairs.asm
deleted file mode 100755
index 02996057..00000000
--- a/data/mapHeaders/route15gateupstairs.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route15GateUpstairs_h:
-	db GATE ; tileset
-	db ROUTE_15_GATE_2F_HEIGHT, ROUTE_15_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route15GateUpstairsBlocks, Route15GateUpstairsTextPointers, Route15GateUpstairsScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route15GateUpstairsObject ; objects
diff --git a/data/mapHeaders/route16.asm b/data/mapHeaders/route16.asm
deleted file mode 100755
index eee71ba2..00000000
--- a/data/mapHeaders/route16.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route16_h:
-	db OVERWORLD ; tileset
-	db ROUTE_16_HEIGHT, ROUTE_16_WIDTH ; dimensions (y, x)
-	dw Route16Blocks, Route16TextPointers, Route16Script ; blocks, texts, scripts
-	db SOUTH | EAST ; connections
-	SOUTH_MAP_CONNECTION ROUTE_16, ROUTE_17, 0, 0, Route17Blocks
-	EAST_MAP_CONNECTION ROUTE_16, CELADON_CITY, -3, 1, CeladonCityBlocks, 1
-	dw Route16Object ; objects
diff --git a/data/mapHeaders/route16gate.asm b/data/mapHeaders/route16gate.asm
deleted file mode 100755
index 32d0729b..00000000
--- a/data/mapHeaders/route16gate.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route16Gate_h:
-	db GATE ; tileset
-	db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route16GateBlocks, Route16GateTextPointers, Route16GateScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route16GateObject ; objects
diff --git a/data/mapHeaders/route16gateupstairs.asm b/data/mapHeaders/route16gateupstairs.asm
deleted file mode 100755
index 32c32433..00000000
--- a/data/mapHeaders/route16gateupstairs.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route16GateUpstairs_h:
-	db GATE ; tileset
-	db ROUTE_16_GATE_2F_HEIGHT, ROUTE_16_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route16GateUpstairsBlocks, Route16GateUpstairsTextPointers, Route16GateUpstairsScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route16GateUpstairsObject ; objects
diff --git a/data/mapHeaders/route16house.asm b/data/mapHeaders/route16house.asm
deleted file mode 100755
index 2b633873..00000000
--- a/data/mapHeaders/route16house.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route16House_h:
-	db HOUSE ; tileset
-	db ROUTE_16_HOUSE_HEIGHT, ROUTE_16_HOUSE_WIDTH ; dimensions (y, x)
-	dw Route16HouseBlocks, Route16HouseTextPointers, Route16HouseScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route16HouseObject ; objects
diff --git a/data/mapHeaders/route17.asm b/data/mapHeaders/route17.asm
deleted file mode 100755
index 82a5d0f4..00000000
--- a/data/mapHeaders/route17.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route17_h:
-	db OVERWORLD ; tileset
-	db ROUTE_17_HEIGHT, ROUTE_17_WIDTH ; dimensions (y, x)
-	dw Route17Blocks, Route17TextPointers, Route17Script ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_17, ROUTE_16, 0, 0, Route16Blocks
-	SOUTH_MAP_CONNECTION ROUTE_17, ROUTE_18, 0, 0, Route18Blocks, 1
-	dw Route17Object ; objects
diff --git a/data/mapHeaders/route18.asm b/data/mapHeaders/route18.asm
deleted file mode 100755
index 180111b5..00000000
--- a/data/mapHeaders/route18.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route18_h:
-	db OVERWORLD ; tileset
-	db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x)
-	dw Route18Blocks, Route18TextPointers, Route18Script ; blocks, texts, scripts
-	db NORTH | EAST ; connections
-	NORTH_MAP_CONNECTION ROUTE_18, ROUTE_17, 0, 0, Route17Blocks
-	EAST_MAP_CONNECTION ROUTE_18, FUCHSIA_CITY, -3, 1, FuchsiaCityBlocks, 1
-	dw Route18Object ; objects
diff --git a/data/mapHeaders/route18gate.asm b/data/mapHeaders/route18gate.asm
deleted file mode 100755
index 1b519527..00000000
--- a/data/mapHeaders/route18gate.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route18Gate_h:
-	db GATE ; tileset
-	db ROUTE_18_GATE_1F_HEIGHT, ROUTE_18_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route18GateBlocks, Route18GateTextPointers, Route18GateScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route18GateObject ; objects
diff --git a/data/mapHeaders/route18gateupstairs.asm b/data/mapHeaders/route18gateupstairs.asm
deleted file mode 100755
index 3f78af1b..00000000
--- a/data/mapHeaders/route18gateupstairs.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route18GateUpstairs_h:
-	db GATE ; tileset
-	db ROUTE_18_GATE_2F_HEIGHT, ROUTE_18_GATE_2F_WIDTH ; dimensions (y, x)
-	dw Route18GateUpstairsBlocks, Route18GateUpstairsTextPointers, Route18GateUpstairsScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route18GateUpstairsObject ; objects
diff --git a/data/mapHeaders/route19.asm b/data/mapHeaders/route19.asm
deleted file mode 100755
index 1de353f8..00000000
--- a/data/mapHeaders/route19.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route19_h:
-	db OVERWORLD ; tileset
-	db ROUTE_19_HEIGHT, ROUTE_19_WIDTH ; dimensions (y, x)
-	dw Route19Blocks, Route19TextPointers, Route19Script ; blocks, texts, scripts
-	db NORTH | WEST ; connections
-	NORTH_MAP_CONNECTION ROUTE_19, FUCHSIA_CITY, -3, 2, FuchsiaCityBlocks
-	WEST_MAP_CONNECTION ROUTE_19, ROUTE_20, 18, 0, Route20Blocks
-	dw Route19Object ; objects
diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm
deleted file mode 100755
index 550cd702..00000000
--- a/data/mapHeaders/route2.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route2_h:
-	db OVERWORLD ; tileset
-	db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x)
-	dw Route2Blocks, Route2TextPointers, Route2Script ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCityBlocks
-	SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCityBlocks, 1
-	dw Route2Object ; objects
diff --git a/data/mapHeaders/route20.asm b/data/mapHeaders/route20.asm
deleted file mode 100755
index f871179f..00000000
--- a/data/mapHeaders/route20.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route20_h:
-	db OVERWORLD ; tileset
-	db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x)
-	dw Route20Blocks, Route20TextPointers, Route20Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_20, CINNABAR_ISLAND, 0, 0, CinnabarIslandBlocks
-	EAST_MAP_CONNECTION ROUTE_20, ROUTE_19, -3, 15, Route19Blocks
-	dw Route20Object ; objects
diff --git a/data/mapHeaders/route21.asm b/data/mapHeaders/route21.asm
deleted file mode 100755
index a2c06868..00000000
--- a/data/mapHeaders/route21.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route21_h:
-	db OVERWORLD ; tileset
-	db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x)
-	dw Route21Blocks, Route21TextPointers, Route21Script ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_21, PALLET_TOWN, 0, 0, PalletTownBlocks
-	SOUTH_MAP_CONNECTION ROUTE_21, CINNABAR_ISLAND, 0, 0, CinnabarIslandBlocks, 1
-	dw Route21Object ; objects
diff --git a/data/mapHeaders/route22.asm b/data/mapHeaders/route22.asm
deleted file mode 100755
index c227d433..00000000
--- a/data/mapHeaders/route22.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route22_h:
-	db OVERWORLD ; tileset
-	db ROUTE_22_HEIGHT, ROUTE_22_WIDTH ; dimensions (y, x)
-	dw Route22Blocks, Route22TextPointers, Route22Script ; blocks, texts, scripts
-	db NORTH | EAST ; connections
-	NORTH_MAP_CONNECTION ROUTE_22, ROUTE_23, 0, 0, Route23Blocks
-	EAST_MAP_CONNECTION ROUTE_22, VIRIDIAN_CITY, -3, 1, ViridianCityBlocks, 1
-	dw Route22Object ; objects
diff --git a/data/mapHeaders/route22gate.asm b/data/mapHeaders/route22gate.asm
deleted file mode 100755
index a8c20e97..00000000
--- a/data/mapHeaders/route22gate.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route22Gate_h:
-	db GATE ; tileset
-	db ROUTE_22_GATE_HEIGHT, ROUTE_22_GATE_WIDTH ; dimensions (y, x)
-	dw Route22GateBlocks, Route22GateTextPointers, Route22GateScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route22GateObject ; objects
diff --git a/data/mapHeaders/route23.asm b/data/mapHeaders/route23.asm
deleted file mode 100755
index bec192c2..00000000
--- a/data/mapHeaders/route23.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route23_h:
-	db PLATEAU ; tileset
-	db ROUTE_23_HEIGHT, ROUTE_23_WIDTH ; dimensions (y, x)
-	dw Route23Blocks, Route23TextPointers, Route23Script ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_23, INDIGO_PLATEAU, 0, 0, IndigoPlateauBlocks
-	SOUTH_MAP_CONNECTION ROUTE_23, ROUTE_22, 0, 0, Route22Blocks, 1
-	dw Route23Object ; objects
diff --git a/data/mapHeaders/route24.asm b/data/mapHeaders/route24.asm
deleted file mode 100755
index 9a313aba..00000000
--- a/data/mapHeaders/route24.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route24_h:
-	db OVERWORLD ; tileset
-	db ROUTE_24_HEIGHT, ROUTE_24_WIDTH ; dimensions (y, x)
-	dw Route24Blocks, Route24TextPointers, Route24Script ; blocks, texts, scripts
-	db SOUTH | EAST ; connections
-	SOUTH_MAP_CONNECTION ROUTE_24, CERULEAN_CITY, -3, 2, CeruleanCityBlocks, 1
-	EAST_MAP_CONNECTION ROUTE_24, ROUTE_25, 0, 0, Route25Blocks
-	dw Route24Object ; objects
diff --git a/data/mapHeaders/route25.asm b/data/mapHeaders/route25.asm
deleted file mode 100755
index 39ffa45d..00000000
--- a/data/mapHeaders/route25.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-Route25_h:
-	db OVERWORLD ; tileset
-	db ROUTE_25_HEIGHT, ROUTE_25_WIDTH ; dimensions (y, x)
-	dw Route25Blocks, Route25TextPointers, Route25Script ; blocks, texts, scripts
-	db WEST ; connections
-	WEST_MAP_CONNECTION ROUTE_25, ROUTE_24, 0, 0, Route24Blocks
-	dw Route25Object ; objects
diff --git a/data/mapHeaders/route2gate.asm b/data/mapHeaders/route2gate.asm
deleted file mode 100755
index 7ef9f1a8..00000000
--- a/data/mapHeaders/route2gate.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route2Gate_h:
-	db GATE ; tileset
-	db ROUTE_2_GATE_HEIGHT, ROUTE_2_GATE_WIDTH ; dimensions (y, x)
-	dw Route2GateBlocks, Route2GateTextPointers, Route2GateScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route2GateObject ; objects
diff --git a/data/mapHeaders/route2house.asm b/data/mapHeaders/route2house.asm
deleted file mode 100755
index 2fc12748..00000000
--- a/data/mapHeaders/route2house.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route2House_h:
-	db HOUSE ; tileset
-	db ROUTE_2_HOUSE_HEIGHT, ROUTE_2_HOUSE_WIDTH ; dimensions (y, x)
-	dw Route2HouseBlocks, Route2HouseTextPointers, Route2HouseScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route2HouseObject ; objects
diff --git a/data/mapHeaders/route3.asm b/data/mapHeaders/route3.asm
deleted file mode 100755
index 19adfea8..00000000
--- a/data/mapHeaders/route3.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route3_h:
-	db OVERWORLD ; tileset
-	db ROUTE_3_HEIGHT, ROUTE_3_WIDTH ; dimensions (y, x)
-	dw Route3Blocks, Route3TextPointers, Route3Script ; blocks, texts, scripts
-	db NORTH | WEST ; connections
-	NORTH_MAP_CONNECTION ROUTE_3, ROUTE_4, 25, 0, Route4Blocks
-	WEST_MAP_CONNECTION ROUTE_3, PEWTER_CITY, -3, 1, PewterCityBlocks
-	dw Route3Object ; objects
diff --git a/data/mapHeaders/route4.asm b/data/mapHeaders/route4.asm
deleted file mode 100755
index 26670e6d..00000000
--- a/data/mapHeaders/route4.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route4_h:
-	db OVERWORLD ; tileset
-	db ROUTE_4_HEIGHT, ROUTE_4_WIDTH ; dimensions (y, x)
-	dw Route4Blocks, Route4TextPointers, Route4Script ; blocks, texts, scripts
-	db SOUTH | EAST ; connections
-	SOUTH_MAP_CONNECTION ROUTE_4, ROUTE_3, -3, 22, Route3Blocks
-	EAST_MAP_CONNECTION ROUTE_4, CERULEAN_CITY, -3, 1, CeruleanCityBlocks, 1
-	dw Route4Object ; objects
diff --git a/data/mapHeaders/route5.asm b/data/mapHeaders/route5.asm
deleted file mode 100755
index b982c02d..00000000
--- a/data/mapHeaders/route5.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route5_h:
-	db OVERWORLD ; tileset
-	db ROUTE_5_HEIGHT, ROUTE_5_WIDTH ; dimensions (y, x)
-	dw Route5Blocks, Route5TextPointers, Route5Script ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_5, CERULEAN_CITY, -3, 2, CeruleanCityBlocks
-	SOUTH_MAP_CONNECTION ROUTE_5, SAFFRON_CITY, -3, 2, SaffronCityBlocks, 1
-	dw Route5Object ; objects
diff --git a/data/mapHeaders/route5gate.asm b/data/mapHeaders/route5gate.asm
deleted file mode 100755
index be3fd45c..00000000
--- a/data/mapHeaders/route5gate.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route5Gate_h:
-	db GATE ; tileset
-	db ROUTE_5_GATE_HEIGHT, ROUTE_5_GATE_WIDTH ; dimensions (y, x)
-	dw Route5GateBlocks, Route5GateTextPointers, Route5GateScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route5GateObject ; objects
diff --git a/data/mapHeaders/route6.asm b/data/mapHeaders/route6.asm
deleted file mode 100755
index 6ed13d4e..00000000
--- a/data/mapHeaders/route6.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route6_h:
-	db OVERWORLD ; tileset
-	db ROUTE_6_HEIGHT, ROUTE_6_WIDTH ; dimensions (y, x)
-	dw Route6Blocks, Route6TextPointers, Route6Script ; blocks, texts, scripts
-	db NORTH | SOUTH ; connections
-	NORTH_MAP_CONNECTION ROUTE_6, SAFFRON_CITY, -3, 2, SaffronCityBlocks
-	SOUTH_MAP_CONNECTION ROUTE_6, VERMILION_CITY, -3, 2, VermilionCityBlocks, 1
-	dw Route6Object ; objects
diff --git a/data/mapHeaders/route6gate.asm b/data/mapHeaders/route6gate.asm
deleted file mode 100755
index 37c5032f..00000000
--- a/data/mapHeaders/route6gate.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route6Gate_h:
-	db GATE ; tileset
-	db ROUTE_6_GATE_HEIGHT, ROUTE_6_GATE_WIDTH ; dimensions (y, x)
-	dw Route6GateBlocks, Route6GateTextPointers, Route6GateScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route6GateObject ; objects
diff --git a/data/mapHeaders/route7.asm b/data/mapHeaders/route7.asm
deleted file mode 100755
index 62f3bedf..00000000
--- a/data/mapHeaders/route7.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route7_h:
-	db OVERWORLD ; tileset
-	db ROUTE_7_HEIGHT, ROUTE_7_WIDTH ; dimensions (y, x)
-	dw Route7Blocks, Route7TextPointers, Route7Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_7, CELADON_CITY, -3, 1, CeladonCityBlocks
-	EAST_MAP_CONNECTION ROUTE_7, SAFFRON_CITY, -3, 1, SaffronCityBlocks, 1
-	dw Route7Object ; objects
diff --git a/data/mapHeaders/route7gate.asm b/data/mapHeaders/route7gate.asm
deleted file mode 100755
index 9b5802b3..00000000
--- a/data/mapHeaders/route7gate.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route7Gate_h:
-	db GATE ; tileset
-	db ROUTE_7_GATE_HEIGHT, ROUTE_7_GATE_WIDTH ; dimensions (y, x)
-	dw Route7GateBlocks, Route7GateTextPointers, Route7GateScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route7GateObject ; objects
diff --git a/data/mapHeaders/route8.asm b/data/mapHeaders/route8.asm
deleted file mode 100755
index 5187fd8f..00000000
--- a/data/mapHeaders/route8.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route8_h:
-	db OVERWORLD ; tileset
-	db ROUTE_8_HEIGHT, ROUTE_8_WIDTH ; dimensions (y, x)
-	dw Route8Blocks, Route8TextPointers, Route8Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_8, SAFFRON_CITY, -3, 1, SaffronCityBlocks
-	EAST_MAP_CONNECTION ROUTE_8, LAVENDER_TOWN, 0, 0, LavenderTownBlocks
-	dw Route8Object ; objects
diff --git a/data/mapHeaders/route8gate.asm b/data/mapHeaders/route8gate.asm
deleted file mode 100755
index 66593058..00000000
--- a/data/mapHeaders/route8gate.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-Route8Gate_h:
-	db GATE ; tileset
-	db ROUTE_8_GATE_HEIGHT, ROUTE_8_GATE_WIDTH ; dimensions (y, x)
-	dw Route8GateBlocks, Route8GateTextPointers, Route8GateScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw Route8GateObject ; objects
diff --git a/data/mapHeaders/route9.asm b/data/mapHeaders/route9.asm
deleted file mode 100755
index 044a4ec0..00000000
--- a/data/mapHeaders/route9.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-Route9_h:
-	db OVERWORLD ; tileset
-	db ROUTE_9_HEIGHT, ROUTE_9_WIDTH ; dimensions (y, x)
-	dw Route9Blocks, Route9TextPointers, Route9Script ; blocks, texts, scripts
-	db WEST | EAST ; connections
-	WEST_MAP_CONNECTION ROUTE_9, CERULEAN_CITY, -3, 1, CeruleanCityBlocks
-	EAST_MAP_CONNECTION ROUTE_9, ROUTE_10, 0, 0, Route10Blocks, 1
-	dw Route9Object ; objects
diff --git a/data/mapHeaders/safarizonecenter.asm b/data/mapHeaders/safarizonecenter.asm
deleted file mode 100755
index 39f20b5d..00000000
--- a/data/mapHeaders/safarizonecenter.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SafariZoneCenter_h:
-	db FOREST ; tileset
-	db SAFARI_ZONE_CENTER_HEIGHT, SAFARI_ZONE_CENTER_WIDTH ; dimensions (y, x)
-	dw SafariZoneCenterBlocks, SafariZoneCenterTextPointers, SafariZoneCenterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw SafariZoneCenterObject ; objects
diff --git a/data/mapHeaders/safarizoneeast.asm b/data/mapHeaders/safarizoneeast.asm
deleted file mode 100755
index f94a92bf..00000000
--- a/data/mapHeaders/safarizoneeast.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SafariZoneEast_h:
-	db FOREST ; tileset
-	db SAFARI_ZONE_EAST_HEIGHT, SAFARI_ZONE_EAST_WIDTH ; dimensions (y, x)
-	dw SafariZoneEastBlocks, SafariZoneEastTextPointers, SafariZoneEastScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw SafariZoneEastObject ; objects
diff --git a/data/mapHeaders/safarizoneentrance.asm b/data/mapHeaders/safarizoneentrance.asm
deleted file mode 100755
index e2eabdcd..00000000
--- a/data/mapHeaders/safarizoneentrance.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SafariZoneEntrance_h:
-	db GATE ; tileset
-	db SAFARI_ZONE_ENTRANCE_HEIGHT, SAFARI_ZONE_ENTRANCE_WIDTH ; dimensions (y, x)
-	dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw SafariZoneEntranceObject ; objects
diff --git a/data/mapHeaders/safarizonenorth.asm b/data/mapHeaders/safarizonenorth.asm
deleted file mode 100755
index 5b01138d..00000000
--- a/data/mapHeaders/safarizonenorth.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SafariZoneNorth_h:
-	db FOREST ; tileset
-	db SAFARI_ZONE_NORTH_HEIGHT, SAFARI_ZONE_NORTH_WIDTH ; dimensions (y, x)
-	dw SafariZoneNorthBlocks, SafariZoneNorthTextPointers, SafariZoneNorthScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw SafariZoneNorthObject ; objects
diff --git a/data/mapHeaders/safarizoneresthouse1.asm b/data/mapHeaders/safarizoneresthouse1.asm
deleted file mode 100755
index 0169c61f..00000000
--- a/data/mapHeaders/safarizoneresthouse1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SafariZoneRestHouse1_h:
-	db GATE ; tileset
-	db SAFARI_ZONE_REST_HOUSE_1_HEIGHT, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw SafariZoneRestHouse1Blocks, SafariZoneRestHouse1TextPointers, SafariZoneRestHouse1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SafariZoneRestHouse1Object ; objects
diff --git a/data/mapHeaders/safarizoneresthouse2.asm b/data/mapHeaders/safarizoneresthouse2.asm
deleted file mode 100755
index 804d619c..00000000
--- a/data/mapHeaders/safarizoneresthouse2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SafariZoneRestHouse2_h:
-	db GATE ; tileset
-	db SAFARI_ZONE_REST_HOUSE_2_HEIGHT, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw SafariZoneRestHouse2Blocks, SafariZoneRestHouse2TextPointers, SafariZoneRestHouse2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SafariZoneRestHouse2Object ; objects
diff --git a/data/mapHeaders/safarizoneresthouse3.asm b/data/mapHeaders/safarizoneresthouse3.asm
deleted file mode 100755
index becd3e7c..00000000
--- a/data/mapHeaders/safarizoneresthouse3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SafariZoneRestHouse3_h:
-	db GATE ; tileset
-	db SAFARI_ZONE_REST_HOUSE_3_HEIGHT, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; dimensions (y, x)
-	dw SafariZoneRestHouse3Blocks, SafariZoneRestHouse3TextPointers, SafariZoneRestHouse3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SafariZoneRestHouse3Object ; objects
diff --git a/data/mapHeaders/safarizoneresthouse4.asm b/data/mapHeaders/safarizoneresthouse4.asm
deleted file mode 100755
index 7cc8fd25..00000000
--- a/data/mapHeaders/safarizoneresthouse4.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SafariZoneRestHouse4_h:
-	db GATE ; tileset
-	db SAFARI_ZONE_REST_HOUSE_4_HEIGHT, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; dimensions (y, x)
-	dw SafariZoneRestHouse4Blocks, SafariZoneRestHouse4TextPointers, SafariZoneRestHouse4Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SafariZoneRestHouse4Object ; objects
diff --git a/data/mapHeaders/safarizonesecrethouse.asm b/data/mapHeaders/safarizonesecrethouse.asm
deleted file mode 100755
index 35575a10..00000000
--- a/data/mapHeaders/safarizonesecrethouse.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SafariZoneSecretHouse_h:
-	db LAB ; tileset
-	db SAFARI_ZONE_SECRET_HOUSE_HEIGHT, SAFARI_ZONE_SECRET_HOUSE_WIDTH ; dimensions (y, x)
-	dw SafariZoneSecretHouseBlocks, SafariZoneSecretHouseTextPointers, SafariZoneSecretHouseScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw SafariZoneSecretHouseObject ; objects
diff --git a/data/mapHeaders/safarizonewest.asm b/data/mapHeaders/safarizonewest.asm
deleted file mode 100755
index 24ac7686..00000000
--- a/data/mapHeaders/safarizonewest.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SafariZoneWest_h:
-	db FOREST ; tileset
-	db SAFARI_ZONE_WEST_HEIGHT, SAFARI_ZONE_WEST_WIDTH ; dimensions (y, x)
-	dw SafariZoneWestBlocks, SafariZoneWestTextPointers, SafariZoneWestScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw SafariZoneWestObject ; objects
diff --git a/data/mapHeaders/saffroncity.asm b/data/mapHeaders/saffroncity.asm
deleted file mode 100755
index 8f4ea922..00000000
--- a/data/mapHeaders/saffroncity.asm
+++ /dev/null
@@ -1,10 +0,0 @@
-SaffronCity_h:
-	db OVERWORLD ; tileset
-	db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x)
-	dw SaffronCityBlocks, SaffronCityTextPointers, SaffronCityScript ; blocks, texts, scripts
-	db NORTH | SOUTH | WEST | EAST ; connections
-	NORTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_5, 5, 0, Route5Blocks
-	SOUTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_6, 5, 0, Route6Blocks, 1
-	WEST_MAP_CONNECTION SAFFRON_CITY, ROUTE_7, 4, 0, Route7Blocks
-	EAST_MAP_CONNECTION SAFFRON_CITY, ROUTE_8, 4, 0, Route8Blocks
-	dw SaffronCityObject ; objects
diff --git a/data/mapHeaders/saffrongym.asm b/data/mapHeaders/saffrongym.asm
deleted file mode 100755
index 4e9fe383..00000000
--- a/data/mapHeaders/saffrongym.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SaffronGym_h:
-	db FACILITY ; tileset
-	db SAFFRON_GYM_HEIGHT, SAFFRON_GYM_WIDTH ; dimensions (y, x)
-	dw SaffronGymBlocks, SaffronGymTextPointers, SaffronGymScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw SaffronGymObject ; objects
diff --git a/data/mapHeaders/saffronhouse1.asm b/data/mapHeaders/saffronhouse1.asm
deleted file mode 100755
index 747b46b4..00000000
--- a/data/mapHeaders/saffronhouse1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SaffronHouse1_h:
-	db HOUSE ; tileset
-	db SAFFRON_HOUSE_1_HEIGHT, SAFFRON_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw SaffronHouse1Blocks, SaffronHouse1TextPointers, SaffronHouse1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SaffronHouse1Object ; objects
diff --git a/data/mapHeaders/saffronhouse2.asm b/data/mapHeaders/saffronhouse2.asm
deleted file mode 100755
index 6a642a73..00000000
--- a/data/mapHeaders/saffronhouse2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SaffronHouse2_h:
-	db HOUSE ; tileset
-	db SAFFRON_HOUSE_2_HEIGHT, SAFFRON_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw SaffronHouse2Blocks, SaffronHouse2TextPointers, SaffronHouse2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SaffronHouse2Object ; objects
diff --git a/data/mapHeaders/saffronmart.asm b/data/mapHeaders/saffronmart.asm
deleted file mode 100755
index 72aadb56..00000000
--- a/data/mapHeaders/saffronmart.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SaffronMart_h:
-	db MART ; tileset
-	db SAFFRON_MART_HEIGHT, SAFFRON_MART_WIDTH ; dimensions (y, x)
-	dw SaffronMartBlocks, SaffronMartTextPointers, SaffronMartScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw SaffronMartObject ; objects
diff --git a/data/mapHeaders/saffronpokecenter.asm b/data/mapHeaders/saffronpokecenter.asm
deleted file mode 100755
index 85e3b5e3..00000000
--- a/data/mapHeaders/saffronpokecenter.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SaffronPokecenter_h:
-	db POKECENTER ; tileset
-	db SAFFRON_POKECENTER_HEIGHT, SAFFRON_POKECENTER_WIDTH ; dimensions (y, x)
-	dw SaffronPokecenterBlocks, SaffronPokecenterTextPointers, SaffronPokecenterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw SaffronPokecenterObject ; objects
diff --git a/data/mapHeaders/school.asm b/data/mapHeaders/school.asm
deleted file mode 100755
index 4c122f2a..00000000
--- a/data/mapHeaders/school.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-School_h:
-	db HOUSE ; tileset
-	db VIRIDIAN_SCHOOL_HEIGHT, VIRIDIAN_SCHOOL_WIDTH ; dimensions (y, x)
-	dw SchoolBlocks, SchoolTextPointers, SchoolScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw SchoolObject ; objects
diff --git a/data/mapHeaders/seafoamislands1.asm b/data/mapHeaders/seafoamislands1.asm
deleted file mode 100755
index 32754b23..00000000
--- a/data/mapHeaders/seafoamislands1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SeafoamIslands1_h:
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_1_HEIGHT, SEAFOAM_ISLANDS_1_WIDTH ; dimensions (y, x)
-	dw SeafoamIslands1Blocks, SeafoamIslands1TextPointers, SeafoamIslands1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SeafoamIslands1Object ; objects
diff --git a/data/mapHeaders/seafoamislands2.asm b/data/mapHeaders/seafoamislands2.asm
deleted file mode 100755
index f59d7201..00000000
--- a/data/mapHeaders/seafoamislands2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SeafoamIslands2_h:
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_2_HEIGHT, SEAFOAM_ISLANDS_2_WIDTH ; dimensions (y, x)
-	dw SeafoamIslands2Blocks, SeafoamIslands2TextPointers, SeafoamIslands2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SeafoamIslands2Object ; objects
diff --git a/data/mapHeaders/seafoamislands3.asm b/data/mapHeaders/seafoamislands3.asm
deleted file mode 100755
index e75325ea..00000000
--- a/data/mapHeaders/seafoamislands3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SeafoamIslands3_h:
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_3_HEIGHT, SEAFOAM_ISLANDS_3_WIDTH ; dimensions (y, x)
-	dw SeafoamIslands3Blocks, SeafoamIslands3TextPointers, SeafoamIslands3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SeafoamIslands3Object ; objects
diff --git a/data/mapHeaders/seafoamislands4.asm b/data/mapHeaders/seafoamislands4.asm
deleted file mode 100755
index 297ecbbb..00000000
--- a/data/mapHeaders/seafoamislands4.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SeafoamIslands4_h:
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_4_HEIGHT, SEAFOAM_ISLANDS_4_WIDTH ; dimensions (y, x)
-	dw SeafoamIslands4Blocks, SeafoamIslands4TextPointers, SeafoamIslands4Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SeafoamIslands4Object ; objects
diff --git a/data/mapHeaders/seafoamislands5.asm b/data/mapHeaders/seafoamislands5.asm
deleted file mode 100755
index 1e8af6f7..00000000
--- a/data/mapHeaders/seafoamislands5.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SeafoamIslands5_h:
-	db CAVERN ; tileset
-	db SEAFOAM_ISLANDS_5_HEIGHT, SEAFOAM_ISLANDS_5_WIDTH ; dimensions (y, x)
-	dw SeafoamIslands5Blocks, SeafoamIslands5TextPointers, SeafoamIslands5Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SeafoamIslands5Object ; objects
diff --git a/data/mapHeaders/silphco1.asm b/data/mapHeaders/silphco1.asm
deleted file mode 100755
index 4a2b176f..00000000
--- a/data/mapHeaders/silphco1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SilphCo1_h:
-	db FACILITY ; tileset
-	db SILPH_CO_1F_HEIGHT, SILPH_CO_1F_WIDTH ; dimensions (y, x)
-	dw SilphCo1Blocks, SilphCo1TextPointers, SilphCo1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SilphCo1Object ; objects
diff --git a/data/mapHeaders/silphco10.asm b/data/mapHeaders/silphco10.asm
deleted file mode 100755
index 716fa025..00000000
--- a/data/mapHeaders/silphco10.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SilphCo10_h:
-	db FACILITY ; tileset
-	db SILPH_CO_10F_HEIGHT, SILPH_CO_10F_WIDTH ; dimensions (y, x)
-	dw SilphCo10Blocks, SilphCo10TextPointers, SilphCo10Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SilphCo10Object ; objects
diff --git a/data/mapHeaders/silphco11.asm b/data/mapHeaders/silphco11.asm
deleted file mode 100755
index 4ed282a9..00000000
--- a/data/mapHeaders/silphco11.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SilphCo11_h:
-	db INTERIOR ; tileset
-	db SILPH_CO_11F_HEIGHT, SILPH_CO_11F_WIDTH ; dimensions (y, x)
-	dw SilphCo11Blocks, SilphCo11TextPointers, SilphCo11Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SilphCo11Object ; objects
diff --git a/data/mapHeaders/silphco2.asm b/data/mapHeaders/silphco2.asm
deleted file mode 100755
index fae02d5b..00000000
--- a/data/mapHeaders/silphco2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SilphCo2_h:
-	db FACILITY ; tileset
-	db SILPH_CO_2F_HEIGHT, SILPH_CO_2F_WIDTH ; dimensions (y, x)
-	dw SilphCo2Blocks, SilphCo2TextPointers, SilphCo2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SilphCo2Object ; objects
diff --git a/data/mapHeaders/silphco3.asm b/data/mapHeaders/silphco3.asm
deleted file mode 100755
index 98a130c0..00000000
--- a/data/mapHeaders/silphco3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SilphCo3_h:
-	db FACILITY ; tileset
-	db SILPH_CO_3F_HEIGHT, SILPH_CO_3F_WIDTH ; dimensions (y, x)
-	dw SilphCo3Blocks, SilphCo3TextPointers, SilphCo3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SilphCo3Object ; objects
diff --git a/data/mapHeaders/silphco4.asm b/data/mapHeaders/silphco4.asm
deleted file mode 100755
index bc91f24b..00000000
--- a/data/mapHeaders/silphco4.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SilphCo4_h:
-	db FACILITY ; tileset
-	db SILPH_CO_4F_HEIGHT, SILPH_CO_4F_WIDTH ; dimensions (y, x)
-	dw SilphCo4Blocks, SilphCo4TextPointers, SilphCo4Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SilphCo4Object ; objects
diff --git a/data/mapHeaders/silphco5.asm b/data/mapHeaders/silphco5.asm
deleted file mode 100755
index c9a4c1d2..00000000
--- a/data/mapHeaders/silphco5.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SilphCo5_h:
-	db FACILITY ; tileset
-	db SILPH_CO_5F_HEIGHT, SILPH_CO_5F_WIDTH ; dimensions (y, x)
-	dw SilphCo5Blocks, SilphCo5TextPointers, SilphCo5Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SilphCo5Object ; objects
diff --git a/data/mapHeaders/silphco6.asm b/data/mapHeaders/silphco6.asm
deleted file mode 100755
index 675709c2..00000000
--- a/data/mapHeaders/silphco6.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SilphCo6_h:
-	db FACILITY ; tileset
-	db SILPH_CO_6F_HEIGHT, SILPH_CO_6F_WIDTH ; dimensions (y, x)
-	dw SilphCo6Blocks, SilphCo6TextPointers, SilphCo6Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SilphCo6Object ; objects
diff --git a/data/mapHeaders/silphco7.asm b/data/mapHeaders/silphco7.asm
deleted file mode 100755
index ee46c3fb..00000000
--- a/data/mapHeaders/silphco7.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SilphCo7_h:
-	db FACILITY ; tileset
-	db SILPH_CO_7F_HEIGHT, SILPH_CO_7F_WIDTH ; dimensions (y, x)
-	dw SilphCo7Blocks, SilphCo7TextPointers, SilphCo7Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SilphCo7Object ; objects
diff --git a/data/mapHeaders/silphco8.asm b/data/mapHeaders/silphco8.asm
deleted file mode 100755
index 90c0ba0f..00000000
--- a/data/mapHeaders/silphco8.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SilphCo8_h:
-	db FACILITY ; tileset
-	db SILPH_CO_8F_HEIGHT, SILPH_CO_8F_WIDTH ; dimensions (y, x)
-	dw SilphCo8Blocks, SilphCo8TextPointers, SilphCo8Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SilphCo8Object ; objects
diff --git a/data/mapHeaders/silphco9.asm b/data/mapHeaders/silphco9.asm
deleted file mode 100755
index 182ec5b2..00000000
--- a/data/mapHeaders/silphco9.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SilphCo9_h:
-	db FACILITY ; tileset
-	db SILPH_CO_9F_HEIGHT, SILPH_CO_9F_WIDTH ; dimensions (y, x)
-	dw SilphCo9Blocks, SilphCo9TextPointers, SilphCo9Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SilphCo9Object ; objects
diff --git a/data/mapHeaders/silphcoelevator.asm b/data/mapHeaders/silphcoelevator.asm
deleted file mode 100755
index 3663cacd..00000000
--- a/data/mapHeaders/silphcoelevator.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SilphCoElevator_h:
-	db LOBBY ; tileset
-	db SILPH_CO_ELEVATOR_HEIGHT, SILPH_CO_ELEVATOR_WIDTH ; dimensions (y, x)
-	dw SilphCoElevatorBlocks, SilphCoElevatorTextPointers, SilphCoElevatorScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw SilphCoElevatorObject ; objects
diff --git a/data/mapHeaders/ssanne1.asm b/data/mapHeaders/ssanne1.asm
deleted file mode 100755
index c69481d6..00000000
--- a/data/mapHeaders/ssanne1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SSAnne1_h:
-	db SHIP ; tileset
-	db SS_ANNE_1_HEIGHT, SS_ANNE_1_WIDTH ; dimensions (y, x)
-	dw SSAnne1Blocks, SSAnne1TextPointers, SSAnne1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SSAnne1Object ; objects
diff --git a/data/mapHeaders/ssanne10.asm b/data/mapHeaders/ssanne10.asm
deleted file mode 100755
index 79464beb..00000000
--- a/data/mapHeaders/ssanne10.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SSAnne10_h:
-	db SHIP ; tileset
-	db SS_ANNE_10_HEIGHT, SS_ANNE_10_WIDTH ; dimensions (y, x)
-	dw SSAnne10Blocks, SSAnne10TextPointers, SSAnne10Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SSAnne10Object ; objects
diff --git a/data/mapHeaders/ssanne2.asm b/data/mapHeaders/ssanne2.asm
deleted file mode 100755
index 7a6294e5..00000000
--- a/data/mapHeaders/ssanne2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SSAnne2_h:
-	db SHIP ; tileset
-	db SS_ANNE_2_HEIGHT, SS_ANNE_2_WIDTH ; dimensions (y, x)
-	dw SSAnne2Blocks, SSAnne2TextPointers, SSAnne2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SSAnne2Object ; objects
diff --git a/data/mapHeaders/ssanne3.asm b/data/mapHeaders/ssanne3.asm
deleted file mode 100755
index 78f9660b..00000000
--- a/data/mapHeaders/ssanne3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SSAnne3_h:
-	db SHIP ; tileset
-	db SS_ANNE_3_HEIGHT, SS_ANNE_3_WIDTH ; dimensions (y, x)
-	dw SSAnne3Blocks, SSAnne3TextPointers, SSAnne3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SSAnne3Object ; objects
diff --git a/data/mapHeaders/ssanne4.asm b/data/mapHeaders/ssanne4.asm
deleted file mode 100755
index 9ad2c66c..00000000
--- a/data/mapHeaders/ssanne4.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SSAnne4_h:
-	db SHIP ; tileset
-	db SS_ANNE_4_HEIGHT, SS_ANNE_4_WIDTH ; dimensions (y, x)
-	dw SSAnne4Blocks, SSAnne4TextPointers, SSAnne4Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SSAnne4Object ; objects
diff --git a/data/mapHeaders/ssanne5.asm b/data/mapHeaders/ssanne5.asm
deleted file mode 100755
index a2c2b943..00000000
--- a/data/mapHeaders/ssanne5.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SSAnne5_h:
-	db SHIP ; tileset
-	db SS_ANNE_5_HEIGHT, SS_ANNE_5_WIDTH ; dimensions (y, x)
-	dw SSAnne5Blocks, SSAnne5TextPointers, SSAnne5Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SSAnne5Object ; objects
diff --git a/data/mapHeaders/ssanne6.asm b/data/mapHeaders/ssanne6.asm
deleted file mode 100755
index 5a939b8f..00000000
--- a/data/mapHeaders/ssanne6.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SSAnne6_h:
-	db SHIP ; tileset
-	db SS_ANNE_6_HEIGHT, SS_ANNE_6_WIDTH ; dimensions (y, x)
-	dw SSAnne6Blocks, SSAnne6TextPointers, SSAnne6Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SSAnne6Object ; objects
diff --git a/data/mapHeaders/ssanne7.asm b/data/mapHeaders/ssanne7.asm
deleted file mode 100755
index 97666530..00000000
--- a/data/mapHeaders/ssanne7.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SSAnne7_h:
-	db SHIP ; tileset
-	db SS_ANNE_7_HEIGHT, SS_ANNE_7_WIDTH ; dimensions (y, x)
-	dw SSAnne7Blocks, SSAnne7TextPointers, SSAnne7Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SSAnne7Object ; objects
diff --git a/data/mapHeaders/ssanne8.asm b/data/mapHeaders/ssanne8.asm
deleted file mode 100755
index 2771ad40..00000000
--- a/data/mapHeaders/ssanne8.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SSAnne8_h:
-	db SHIP ; tileset
-	db SS_ANNE_8_HEIGHT, SS_ANNE_8_WIDTH ; dimensions (y, x)
-	dw SSAnne8Blocks, SSAnne8TextPointers, SSAnne8Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SSAnne8Object ; objects
diff --git a/data/mapHeaders/ssanne9.asm b/data/mapHeaders/ssanne9.asm
deleted file mode 100755
index 8f944cf9..00000000
--- a/data/mapHeaders/ssanne9.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-SSAnne9_h:
-	db SHIP ; tileset
-	db SS_ANNE_9_HEIGHT, SS_ANNE_9_WIDTH ; dimensions (y, x)
-	dw SSAnne9Blocks, SSAnne9TextPointers, SSAnne9Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw SSAnne9Object ; objects
diff --git a/data/mapHeaders/tradecenter.asm b/data/mapHeaders/tradecenter.asm
deleted file mode 100755
index 5d6c7d95..00000000
--- a/data/mapHeaders/tradecenter.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-TradeCenter_h:
-	db CLUB ; tileset
-	db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x)
-	dw TradeCenterBlocks, TradeCenterTextPointers, TradeCenterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw TradeCenterObject ; objects
diff --git a/data/mapHeaders/undergroundpathentranceroute5.asm b/data/mapHeaders/undergroundpathentranceroute5.asm
deleted file mode 100755
index 9f5a2125..00000000
--- a/data/mapHeaders/undergroundpathentranceroute5.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-UndergroundPathEntranceRoute5_h:
-	db GATE ; tileset
-	db PATH_ENTRANCE_ROUTE_5_HEIGHT, PATH_ENTRANCE_ROUTE_5_WIDTH ; dimensions (y, x)
-	dw UndergroundPathEntranceRoute5Blocks, UndergroundPathEntranceRoute5TextPointers, UndergroundPathEntranceRoute5Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw UndergroundPathEntranceRoute5Object ; objects
diff --git a/data/mapHeaders/undergroundpathentranceroute6.asm b/data/mapHeaders/undergroundpathentranceroute6.asm
deleted file mode 100755
index 4a5670af..00000000
--- a/data/mapHeaders/undergroundpathentranceroute6.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-UndergroundPathEntranceRoute6_h:
-	db GATE ; tileset
-	db PATH_ENTRANCE_ROUTE_6_HEIGHT, PATH_ENTRANCE_ROUTE_6_WIDTH ; dimensions (y, x)
-	dw UndergroundPathEntranceRoute6Blocks, UndergroundPathEntranceRoute6TextPointers, UndergroundPathEntranceRoute6Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw UndergroundPathEntranceRoute6Object ; objects
diff --git a/data/mapHeaders/undergroundpathentranceroute7.asm b/data/mapHeaders/undergroundpathentranceroute7.asm
deleted file mode 100755
index e3fe68f0..00000000
--- a/data/mapHeaders/undergroundpathentranceroute7.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-UndergroundPathEntranceRoute7_h:
-	db GATE ; tileset
-	db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
-	dw UndergroundPathEntranceRoute7Blocks, UndergroundPathEntranceRoute7TextPointers, UndergroundPathEntranceRoute7Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw UndergroundPathEntranceRoute7Object ; objects
diff --git a/data/mapHeaders/undergroundpathentranceroute7copy.asm b/data/mapHeaders/undergroundpathentranceroute7copy.asm
deleted file mode 100755
index a15f2f4d..00000000
--- a/data/mapHeaders/undergroundpathentranceroute7copy.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-UndergroundPathEntranceRoute7Copy_h:
-	db GATE ; tileset
-	db PATH_ENTRANCE_ROUTE_7_HEIGHT, PATH_ENTRANCE_ROUTE_7_WIDTH ; dimensions (y, x)
-	dw UndergroundPathEntranceRoute7CopyBlocks, UndergroundPathEntranceRoute7CopyTextPointers, UndergroundPathEntranceRoute7CopyScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw UndergroundPathEntranceRoute7CopyObject ; objects
diff --git a/data/mapHeaders/undergroundpathentranceroute8.asm b/data/mapHeaders/undergroundpathentranceroute8.asm
deleted file mode 100755
index 0698da9a..00000000
--- a/data/mapHeaders/undergroundpathentranceroute8.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-UndergroundPathEntranceRoute8_h:
-	db GATE ; tileset
-	db PATH_ENTRANCE_ROUTE_8_HEIGHT, PATH_ENTRANCE_ROUTE_8_WIDTH ; dimensions (y, x)
-	dw UndergroundPathEntranceRoute8Blocks, UndergroundPathEntranceRoute8TextPointers, UndergroundPathEntranceRoute8Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw UndergroundPathEntranceRoute8Object ; objects
diff --git a/data/mapHeaders/undergroundpathns.asm b/data/mapHeaders/undergroundpathns.asm
deleted file mode 100755
index ba021bea..00000000
--- a/data/mapHeaders/undergroundpathns.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-UndergroundPathNS_h:
-	db UNDERGROUND ; tileset
-	db UNDERGROUND_PATH_NS_HEIGHT, UNDERGROUND_PATH_NS_WIDTH ; dimensions (y, x)
-	dw UndergroundPathNSBlocks, UndergroundPathNSTextPointers, UndergroundPathNSScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw UndergroundPathNSObject ; objects
diff --git a/data/mapHeaders/undergroundpathwe.asm b/data/mapHeaders/undergroundpathwe.asm
deleted file mode 100755
index 7061a8d1..00000000
--- a/data/mapHeaders/undergroundpathwe.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-UndergroundPathWE_h:
-	db UNDERGROUND ; tileset
-	db UNDERGROUND_PATH_WE_HEIGHT, UNDERGROUND_PATH_WE_WIDTH ; dimensions (y, x)
-	dw UndergroundPathWEBlocks, UndergroundPathWETextPointers, UndergroundPathWEScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw UndergroundPathWEObject ; objects
diff --git a/data/mapHeaders/unknowndungeon1.asm b/data/mapHeaders/unknowndungeon1.asm
deleted file mode 100755
index 0c6adbbd..00000000
--- a/data/mapHeaders/unknowndungeon1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-UnknownDungeon1_h:
-	db CAVERN ; tileset
-	db UNKNOWN_DUNGEON_1_HEIGHT, UNKNOWN_DUNGEON_1_WIDTH ; dimensions (y, x)
-	dw UnknownDungeon1Blocks, UnknownDungeon1TextPointers, UnknownDungeon1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw UnknownDungeon1Object ; objects
diff --git a/data/mapHeaders/unknowndungeon2.asm b/data/mapHeaders/unknowndungeon2.asm
deleted file mode 100755
index b5147da2..00000000
--- a/data/mapHeaders/unknowndungeon2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-UnknownDungeon2_h:
-	db CAVERN ; tileset
-	db UNKNOWN_DUNGEON_2_HEIGHT, UNKNOWN_DUNGEON_2_WIDTH ; dimensions (y, x)
-	dw UnknownDungeon2Blocks, UnknownDungeon2TextPointers, UnknownDungeon2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw UnknownDungeon2Object ; objects
diff --git a/data/mapHeaders/unknowndungeon3.asm b/data/mapHeaders/unknowndungeon3.asm
deleted file mode 100755
index 4b5372d2..00000000
--- a/data/mapHeaders/unknowndungeon3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-UnknownDungeon3_h:
-	db CAVERN ; tileset
-	db UNKNOWN_DUNGEON_3_HEIGHT, UNKNOWN_DUNGEON_3_WIDTH ; dimensions (y, x)
-	dw UnknownDungeon3Blocks, UnknownDungeon3TextPointers, UnknownDungeon3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw UnknownDungeon3Object ; objects
diff --git a/data/mapHeaders/vermilioncity.asm b/data/mapHeaders/vermilioncity.asm
deleted file mode 100755
index c162ab24..00000000
--- a/data/mapHeaders/vermilioncity.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-VermilionCity_h:
-	db OVERWORLD ; tileset
-	db VERMILION_CITY_HEIGHT, VERMILION_CITY_WIDTH ; dimensions (y, x)
-	dw VermilionCityBlocks, VermilionCityTextPointers, VermilionCityScript ; blocks, texts, scripts
-	db NORTH | EAST ; connections
-	NORTH_MAP_CONNECTION VERMILION_CITY, ROUTE_6, 5, 0, Route6Blocks
-	EAST_MAP_CONNECTION VERMILION_CITY, ROUTE_11, 4, 0, Route11Blocks
-	dw VermilionCityObject ; objects
diff --git a/data/mapHeaders/vermiliondock.asm b/data/mapHeaders/vermiliondock.asm
deleted file mode 100755
index 5d93f284..00000000
--- a/data/mapHeaders/vermiliondock.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-VermilionDock_h:
-	db SHIP_PORT ; tileset
-	db VERMILION_DOCK_HEIGHT, VERMILION_DOCK_WIDTH ; dimensions (y, x)
-	dw VermilionDockBlocks, VermilionDockTextPointers, VermilionDockScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw VermilionDockObject ; objects
diff --git a/data/mapHeaders/vermiliongym.asm b/data/mapHeaders/vermiliongym.asm
deleted file mode 100755
index e960a70f..00000000
--- a/data/mapHeaders/vermiliongym.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-VermilionGym_h:
-	db GYM ; tileset
-	db VERMILION_GYM_HEIGHT, VERMILION_GYM_WIDTH ; dimensions (y, x)
-	dw VermilionGymBlocks, VermilionGymTextPointers, VermilionGymScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw VermilionGymObject ; objects
diff --git a/data/mapHeaders/vermilionhouse1.asm b/data/mapHeaders/vermilionhouse1.asm
deleted file mode 100755
index 47375c91..00000000
--- a/data/mapHeaders/vermilionhouse1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-VermilionHouse1_h:
-	db HOUSE ; tileset
-	db VERMILION_HOUSE_1_HEIGHT, VERMILION_HOUSE_1_WIDTH ; dimensions (y, x)
-	dw VermilionHouse1Blocks, VermilionHouse1TextPointers, VermilionHouse1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw VermilionHouse1Object ; objects
diff --git a/data/mapHeaders/vermilionhouse2.asm b/data/mapHeaders/vermilionhouse2.asm
deleted file mode 100755
index 3a870db3..00000000
--- a/data/mapHeaders/vermilionhouse2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-VermilionHouse2_h:
-	db HOUSE ; tileset
-	db VERMILION_HOUSE_2_HEIGHT, VERMILION_HOUSE_2_WIDTH ; dimensions (y, x)
-	dw VermilionHouse2Blocks, VermilionHouse2TextPointers, VermilionHouse2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw VermilionHouse2Object ; objects
diff --git a/data/mapHeaders/vermilionhouse3.asm b/data/mapHeaders/vermilionhouse3.asm
deleted file mode 100755
index 139f69f6..00000000
--- a/data/mapHeaders/vermilionhouse3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-VermilionHouse3_h:
-	db HOUSE ; tileset
-	db VERMILION_HOUSE_3_HEIGHT, VERMILION_HOUSE_3_WIDTH ; dimensions (y, x)
-	dw VermilionHouse3Blocks, VermilionHouse3TextPointers, VermilionHouse3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw VermilionHouse3Object ; objects
diff --git a/data/mapHeaders/vermilionmart.asm b/data/mapHeaders/vermilionmart.asm
deleted file mode 100755
index e9dcd913..00000000
--- a/data/mapHeaders/vermilionmart.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-VermilionMart_h:
-	db MART ; tileset
-	db VERMILION_MART_HEIGHT, VERMILION_MART_WIDTH ; dimensions (y, x)
-	dw VermilionMartBlocks, VermilionMartTextPointers, VermilionMartScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw VermilionMartObject ; objects
diff --git a/data/mapHeaders/vermilionpokecenter.asm b/data/mapHeaders/vermilionpokecenter.asm
deleted file mode 100755
index 6a84204d..00000000
--- a/data/mapHeaders/vermilionpokecenter.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-VermilionPokecenter_h:
-	db POKECENTER ; tileset
-	db VERMILION_POKECENTER_HEIGHT, VERMILION_POKECENTER_WIDTH ; dimensions (y, x)
-	dw VermilionPokecenterBlocks, VermilionPokecenterTextPointers, VermilionPokecenterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw VermilionPokecenterObject ; objects
diff --git a/data/mapHeaders/victoryroad1.asm b/data/mapHeaders/victoryroad1.asm
deleted file mode 100755
index cb902e37..00000000
--- a/data/mapHeaders/victoryroad1.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-VictoryRoad1_h:
-	db CAVERN ; tileset
-	db VICTORY_ROAD_1_HEIGHT, VICTORY_ROAD_1_WIDTH ; dimensions (y, x)
-	dw VictoryRoad1Blocks, VictoryRoad1TextPointers, VictoryRoad1Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw VictoryRoad1Object ; objects
diff --git a/data/mapHeaders/victoryroad2.asm b/data/mapHeaders/victoryroad2.asm
deleted file mode 100755
index 223652e5..00000000
--- a/data/mapHeaders/victoryroad2.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-VictoryRoad2_h:
-	db CAVERN ; tileset
-	db VICTORY_ROAD_2_HEIGHT, VICTORY_ROAD_2_WIDTH ; dimensions (y, x)
-	dw VictoryRoad2Blocks, VictoryRoad2TextPointers, VictoryRoad2Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw VictoryRoad2Object ; objects
diff --git a/data/mapHeaders/victoryroad3.asm b/data/mapHeaders/victoryroad3.asm
deleted file mode 100755
index 5401fe10..00000000
--- a/data/mapHeaders/victoryroad3.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-VictoryRoad3_h:
-	db CAVERN ; tileset
-	db VICTORY_ROAD_3_HEIGHT, VICTORY_ROAD_3_WIDTH ; dimensions (y, x)
-	dw VictoryRoad3Blocks, VictoryRoad3TextPointers, VictoryRoad3Script ; blocks, texts, scripts
-	db 0 ; connections
-	dw VictoryRoad3Object ; objects
diff --git a/data/mapHeaders/viridiancity.asm b/data/mapHeaders/viridiancity.asm
deleted file mode 100755
index 79b19368..00000000
--- a/data/mapHeaders/viridiancity.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-ViridianCity_h:
-	db OVERWORLD ; tileset
-	db VIRIDIAN_CITY_HEIGHT, VIRIDIAN_CITY_WIDTH ; dimensions (y, x)
-	dw ViridianCityBlocks, ViridianCityTextPointers, ViridianCityScript ; blocks, texts, scripts
-	db NORTH | SOUTH | WEST ; connections
-	NORTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_2, 5, 0, Route2Blocks
-	SOUTH_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_1, 5, 0, Route1Blocks, 1
-	WEST_MAP_CONNECTION VIRIDIAN_CITY, ROUTE_22, 4, 0, Route22Blocks
-	dw ViridianCityObject ; objects
diff --git a/data/mapHeaders/viridianforest.asm b/data/mapHeaders/viridianforest.asm
deleted file mode 100755
index 250f3de8..00000000
--- a/data/mapHeaders/viridianforest.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-ViridianForest_h:
-	db FOREST ; tileset
-	db VIRIDIAN_FOREST_HEIGHT, VIRIDIAN_FOREST_WIDTH ; dimensions (y, x)
-	dw ViridianForestBlocks, ViridianForestTextPointers, ViridianForestScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw ViridianForestObject ; objects
diff --git a/data/mapHeaders/viridianforestentrance.asm b/data/mapHeaders/viridianforestentrance.asm
deleted file mode 100755
index 81534daa..00000000
--- a/data/mapHeaders/viridianforestentrance.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-ViridianForestEntrance_h:
-	db FOREST_GATE ; tileset
-	db VIRIDIAN_FOREST_ENTRANCE_HEIGHT, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; dimensions (y, x)
-	dw ViridianForestEntranceBlocks, ViridianForestEntranceTextPointers, ViridianForestEntranceScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw ViridianForestEntranceObject ; objects
diff --git a/data/mapHeaders/viridianforestexit.asm b/data/mapHeaders/viridianforestexit.asm
deleted file mode 100755
index 9c492487..00000000
--- a/data/mapHeaders/viridianforestexit.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-ViridianForestExit_h:
-	db FOREST_GATE ; tileset
-	db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x)
-	dw ViridianForestExitBlocks, ViridianForestExitTextPointers, ViridianForestExitScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw ViridianForestExitObject ; objects
diff --git a/data/mapHeaders/viridiangym.asm b/data/mapHeaders/viridiangym.asm
deleted file mode 100755
index 19833cf0..00000000
--- a/data/mapHeaders/viridiangym.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-ViridianGym_h:
-	db GYM ; tileset
-	db VIRIDIAN_GYM_HEIGHT, VIRIDIAN_GYM_WIDTH ; dimensions (y, x)
-	dw ViridianGymBlocks, ViridianGymTextPointers, ViridianGymScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw ViridianGymObject ; objects
diff --git a/data/mapHeaders/viridianhouse.asm b/data/mapHeaders/viridianhouse.asm
deleted file mode 100755
index 9b2c73de..00000000
--- a/data/mapHeaders/viridianhouse.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-ViridianHouse_h:
-	db HOUSE ; tileset
-	db VIRIDIAN_HOUSE_HEIGHT, VIRIDIAN_HOUSE_WIDTH ; dimensions (y, x)
-	dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw ViridianHouseObject ; objects
diff --git a/data/mapHeaders/viridianmart.asm b/data/mapHeaders/viridianmart.asm
deleted file mode 100755
index 39281567..00000000
--- a/data/mapHeaders/viridianmart.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-ViridianMart_h:
-	db MART ; tileset
-	db VIRIDIAN_MART_HEIGHT, VIRIDIAN_MART_WIDTH ; dimensions (y, x)
-	dw ViridianMartBlocks, ViridianMartTextPointers, ViridianMartScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw ViridianMartObject ; objects
diff --git a/data/mapHeaders/viridianpokecenter.asm b/data/mapHeaders/viridianpokecenter.asm
deleted file mode 100755
index fbef5193..00000000
--- a/data/mapHeaders/viridianpokecenter.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-ViridianPokecenter_h:
-	db POKECENTER ; tileset
-	db VIRIDIAN_POKECENTER_HEIGHT, VIRIDIAN_POKECENTER_WIDTH ; dimensions (y, x)
-	dw ViridianPokecenterBlocks, ViridianPokecenterTextPointers, ViridianPokeCenterScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw ViridianPokecenterObject ; objects
diff --git a/data/mapObjects/agatha.asm b/data/mapObjects/AgathasRoom.asm
index cd8bbfe7..4a82e78d 100755
--- a/data/mapObjects/agatha.asm
+++ b/data/mapObjects/AgathasRoom.asm
@@ -1,4 +1,4 @@
-AgathaObject:
+AgathasRoom_Object:
 	db $0 ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/bikeshop.asm b/data/mapObjects/BikeShop.asm
index 98208a94..9f21ab3e 100755
--- a/data/mapObjects/bikeshop.asm
+++ b/data/mapObjects/BikeShop.asm
@@ -1,4 +1,4 @@
-BikeShopObject:
+BikeShop_Object:
 	db $e ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/billshouse.asm b/data/mapObjects/BillsHouse.asm
index 317d7c01..c8f708cb 100755
--- a/data/mapObjects/billshouse.asm
+++ b/data/mapObjects/BillsHouse.asm
@@ -1,4 +1,4 @@
-BillsHouseObject:
+BillsHouse_Object:
 	db $d ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/BluesHouse.asm
index 19338885..45ca1286 100755
--- a/data/mapObjects/blueshouse.asm
+++ b/data/mapObjects/BluesHouse.asm
@@ -1,4 +1,4 @@
-BluesHouseObject:
+BluesHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/BrunosRoom.asm
index 45d21186..dde1e2dd 100755
--- a/data/mapObjects/bruno.asm
+++ b/data/mapObjects/BrunosRoom.asm
@@ -1,4 +1,4 @@
-BrunoObject:
+BrunosRoom_Object:
 	db $3 ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/celadonhouse.asm b/data/mapObjects/CeladonChiefHouse.asm
index d24354a6..88850f35 100755
--- a/data/mapObjects/celadonhouse.asm
+++ b/data/mapObjects/CeladonChiefHouse.asm
@@ -1,4 +1,4 @@
-CeladonHouseObject:
+CeladonChiefHouse_Object:
 	db $f ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ CeladonHouseObject:
 	object SPRITE_SAILOR, 5, 6, STAY, LEFT, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, CELADON_HOUSE_WIDTH
-	warp_to 3, 7, CELADON_HOUSE_WIDTH
+	warp_to 2, 7, CELADON_CHIEF_HOUSE_WIDTH
+	warp_to 3, 7, CELADON_CHIEF_HOUSE_WIDTH
diff --git a/data/mapObjects/celadoncity.asm b/data/mapObjects/CeladonCity.asm
index f3e481f4..005fc61e 100755
--- a/data/mapObjects/celadoncity.asm
+++ b/data/mapObjects/CeladonCity.asm
@@ -1,19 +1,19 @@
-CeladonCityObject:
+CeladonCity_Object:
 	db $f ; border block
 
 	db 13 ; warps
-	warp 8, 13, 0, CELADON_MART_1
-	warp 10, 13, 2, CELADON_MART_1
-	warp 24, 9, 0, CELADON_MANSION_1
-	warp 24, 3, 2, CELADON_MANSION_1
-	warp 25, 3, 2, CELADON_MANSION_1
+	warp 8, 13, 0, CELADON_MART_1F
+	warp 10, 13, 2, CELADON_MART_1F
+	warp 24, 9, 0, CELADON_MANSION_1F
+	warp 24, 3, 2, CELADON_MANSION_1F
+	warp 25, 3, 2, CELADON_MANSION_1F
 	warp 41, 9, 0, CELADON_POKECENTER
 	warp 12, 27, 0, CELADON_GYM
 	warp 28, 19, 0, GAME_CORNER
-	warp 39, 19, 0, CELADON_MART_5 ; beta warp! no longer used
-	warp 33, 19, 0, CELADON_PRIZE_ROOM
+	warp 39, 19, 0, CELADON_MART_5F ; beta warp! no longer used
+	warp 33, 19, 0, GAME_CORNER_PRIZE_ROOM
 	warp 31, 27, 0, CELADON_DINER
-	warp 35, 27, 0, CELADON_HOUSE
+	warp 35, 27, 0, CELADON_CHIEF_HOUSE
 	warp 43, 27, 0, CELADON_HOTEL
 
 	db 9 ; signs
@@ -39,16 +39,16 @@ CeladonCityObject:
 	object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person
 
 	; warp-to
-	warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1
-	warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1
-	warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1
-	warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1
-	warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1
+	warp_to 8, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F
+	warp_to 10, 13, CELADON_CITY_WIDTH ; CELADON_MART_1F
+	warp_to 24, 9, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
+	warp_to 24, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
+	warp_to 25, 3, CELADON_CITY_WIDTH ; CELADON_MANSION_1F
 	warp_to 41, 9, CELADON_CITY_WIDTH ; CELADON_POKECENTER
 	warp_to 12, 27, CELADON_CITY_WIDTH ; CELADON_GYM
 	warp_to 28, 19, CELADON_CITY_WIDTH ; GAME_CORNER
-	warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5
-	warp_to 33, 19, CELADON_CITY_WIDTH ; CELADON_PRIZE_ROOM
+	warp_to 39, 19, CELADON_CITY_WIDTH ; CELADON_MART_5F
+	warp_to 33, 19, CELADON_CITY_WIDTH ; GAME_CORNER_PRIZE_ROOM
 	warp_to 31, 27, CELADON_CITY_WIDTH ; CELADON_DINER
-	warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_HOUSE
+	warp_to 35, 27, CELADON_CITY_WIDTH ; CELADON_CHIEF_HOUSE
 	warp_to 43, 27, CELADON_CITY_WIDTH ; CELADON_HOTEL
diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/CeladonDiner.asm
index b976a045..0a4a895d 100755
--- a/data/mapObjects/celadondiner.asm
+++ b/data/mapObjects/CeladonDiner.asm
@@ -1,4 +1,4 @@
-CeladonDinerObject:
+CeladonDiner_Object:
 	db $f ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/celadongym.asm b/data/mapObjects/CeladonGym.asm
index b087153b..98fce576 100755
--- a/data/mapObjects/celadongym.asm
+++ b/data/mapObjects/CeladonGym.asm
@@ -1,4 +1,4 @@
-CeladonGymObject:
+CeladonGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/celadonhotel.asm b/data/mapObjects/CeladonHotel.asm
index 09b4d99c..f4aa1305 100755
--- a/data/mapObjects/celadonhotel.asm
+++ b/data/mapObjects/CeladonHotel.asm
@@ -1,4 +1,4 @@
-CeladonHotelObject:
+CeladonHotel_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/celadonmansion1.asm b/data/mapObjects/CeladonMansion1F.asm
index 423a9a2e..1abd434c 100755
--- a/data/mapObjects/celadonmansion1.asm
+++ b/data/mapObjects/CeladonMansion1F.asm
@@ -1,12 +1,12 @@
-CeladonMansion1Object:
+CeladonMansion1F_Object:
 	db $f ; border block
 
 	db 5 ; warps
 	warp 4, 11, 2, -1
 	warp 5, 11, 2, -1
 	warp 4, 0, 4, -1
-	warp 7, 1, 1, CELADON_MANSION_2
-	warp 2, 1, 2, CELADON_MANSION_2
+	warp 7, 1, 1, CELADON_MANSION_2F
+	warp 2, 1, 2, CELADON_MANSION_2F
 
 	db 1 ; signs
 	sign 4, 9, 5 ; CeladonMansion1Text5
@@ -18,8 +18,8 @@ CeladonMansion1Object:
 	object SPRITE_SLOWBRO, 4, 4, WALK, 1, 4 ; person
 
 	; warp-to
-	warp_to 4, 11, CELADON_MANSION_1_WIDTH
-	warp_to 5, 11, CELADON_MANSION_1_WIDTH
-	warp_to 4, 0, CELADON_MANSION_1_WIDTH
-	warp_to 7, 1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2
-	warp_to 2, 1, CELADON_MANSION_1_WIDTH ; CELADON_MANSION_2
+	warp_to 4, 11, CELADON_MANSION_1F_WIDTH
+	warp_to 5, 11, CELADON_MANSION_1F_WIDTH
+	warp_to 4, 0, CELADON_MANSION_1F_WIDTH
+	warp_to 7, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F
+	warp_to 2, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F
diff --git a/data/mapObjects/CeladonMansion2F.asm b/data/mapObjects/CeladonMansion2F.asm
new file mode 100755
index 00000000..09c94d29
--- /dev/null
+++ b/data/mapObjects/CeladonMansion2F.asm
@@ -0,0 +1,19 @@
+CeladonMansion2F_Object:
+	db $f ; border block
+
+	db 4 ; warps
+	warp 6, 1, 0, CELADON_MANSION_3F
+	warp 7, 1, 3, CELADON_MANSION_1F
+	warp 2, 1, 4, CELADON_MANSION_1F
+	warp 4, 1, 3, CELADON_MANSION_3F
+
+	db 1 ; signs
+	sign 4, 9, 1 ; CeladonMansion2Text1
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 6, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F
+	warp_to 7, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F
+	warp_to 2, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_1F
+	warp_to 4, 1, CELADON_MANSION_2F_WIDTH ; CELADON_MANSION_3F
diff --git a/data/mapObjects/celadonmansion3.asm b/data/mapObjects/CeladonMansion3F.asm
index e9718d9f..32701f14 100755
--- a/data/mapObjects/celadonmansion3.asm
+++ b/data/mapObjects/CeladonMansion3F.asm
@@ -1,11 +1,11 @@
-CeladonMansion3Object:
+CeladonMansion3F_Object:
 	db $f ; border block
 
 	db 4 ; warps
-	warp 6, 1, 0, CELADON_MANSION_2
-	warp 7, 1, 0, CELADON_MANSION_4
-	warp 2, 1, 1, CELADON_MANSION_4
-	warp 4, 1, 3, CELADON_MANSION_2
+	warp 6, 1, 0, CELADON_MANSION_2F
+	warp 7, 1, 0, CELADON_MANSION_ROOF
+	warp 2, 1, 1, CELADON_MANSION_ROOF
+	warp 4, 1, 3, CELADON_MANSION_2F
 
 	db 4 ; signs
 	sign 1, 3, 5 ; CeladonMansion3Text5
@@ -20,7 +20,7 @@ CeladonMansion3Object:
 	object SPRITE_LAPRAS_GIVER, 2, 3, STAY, NONE, 4 ; person
 
 	; warp-to
-	warp_to 6, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2
-	warp_to 7, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4
-	warp_to 2, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_4
-	warp_to 4, 1, CELADON_MANSION_3_WIDTH ; CELADON_MANSION_2
+	warp_to 6, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F
+	warp_to 7, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF
+	warp_to 2, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_ROOF
+	warp_to 4, 1, CELADON_MANSION_3F_WIDTH ; CELADON_MANSION_2F
diff --git a/data/mapObjects/CeladonMansionRoof.asm b/data/mapObjects/CeladonMansionRoof.asm
new file mode 100755
index 00000000..353b0b96
--- /dev/null
+++ b/data/mapObjects/CeladonMansionRoof.asm
@@ -0,0 +1,17 @@
+CeladonMansionRoof_Object:
+	db $9 ; border block
+
+	db 3 ; warps
+	warp 6, 1, 1, CELADON_MANSION_3F
+	warp 2, 1, 2, CELADON_MANSION_3F
+	warp 2, 7, 0, CELADON_MANSION_ROOF_HOUSE
+
+	db 1 ; signs
+	sign 3, 7, 1 ; CeladonMansion4Text1
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 6, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F
+	warp_to 2, 1, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_3F
+	warp_to 2, 7, CELADON_MANSION_ROOF_WIDTH ; CELADON_MANSION_ROOF_HOUSE
diff --git a/data/mapObjects/CeladonMansionRoofHouse.asm b/data/mapObjects/CeladonMansionRoofHouse.asm
new file mode 100755
index 00000000..b6a6149f
--- /dev/null
+++ b/data/mapObjects/CeladonMansionRoofHouse.asm
@@ -0,0 +1,16 @@
+CeladonMansionRoofHouse_Object:
+	db $a ; border block
+
+	db 2 ; warps
+	warp 2, 7, 2, CELADON_MANSION_ROOF
+	warp 3, 7, 2, CELADON_MANSION_ROOF
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person
+	object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person
+
+	; warp-to
+	warp_to 2, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF
+	warp_to 3, 7, CELADON_MANSION_ROOF_HOUSE_WIDTH ; CELADON_MANSION_ROOF
diff --git a/data/mapObjects/celadonmart1.asm b/data/mapObjects/CeladonMart1F.asm
index bfd66996..2037369a 100755
--- a/data/mapObjects/celadonmart1.asm
+++ b/data/mapObjects/CeladonMart1F.asm
@@ -1,4 +1,4 @@
-CeladonMart1Object:
+CeladonMart1F_Object:
 	db $f ; border block
 
 	db 6 ; warps
@@ -6,7 +6,7 @@ CeladonMart1Object:
 	warp 3, 7, 0, -1
 	warp 16, 7, 1, -1
 	warp 17, 7, 1, -1
-	warp 12, 1, 0, CELADON_MART_2
+	warp 12, 1, 0, CELADON_MART_2F
 	warp 1, 1, 0, CELADON_MART_ELEVATOR
 
 	db 2 ; signs
@@ -17,9 +17,9 @@ CeladonMart1Object:
 	object SPRITE_CABLE_CLUB_WOMAN, 8, 3, STAY, DOWN, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, CELADON_MART_1_WIDTH
-	warp_to 3, 7, CELADON_MART_1_WIDTH
-	warp_to 16, 7, CELADON_MART_1_WIDTH
-	warp_to 17, 7, CELADON_MART_1_WIDTH
-	warp_to 12, 1, CELADON_MART_1_WIDTH ; CELADON_MART_2
-	warp_to 1, 1, CELADON_MART_1_WIDTH ; CELADON_MART_ELEVATOR
+	warp_to 2, 7, CELADON_MART_1F_WIDTH
+	warp_to 3, 7, CELADON_MART_1F_WIDTH
+	warp_to 16, 7, CELADON_MART_1F_WIDTH
+	warp_to 17, 7, CELADON_MART_1F_WIDTH
+	warp_to 12, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_2F
+	warp_to 1, 1, CELADON_MART_1F_WIDTH ; CELADON_MART_ELEVATOR
diff --git a/data/mapObjects/celadonmart2.asm b/data/mapObjects/CeladonMart2F.asm
index 215861e6..2f5f428e 100755
--- a/data/mapObjects/celadonmart2.asm
+++ b/data/mapObjects/CeladonMart2F.asm
@@ -1,9 +1,9 @@
-CeladonMart2Object:
+CeladonMart2F_Object:
 	db $f ; border block
 
 	db 3 ; warps
-	warp 12, 1, 4, CELADON_MART_1
-	warp 16, 1, 1, CELADON_MART_3
+	warp 12, 1, 4, CELADON_MART_1F
+	warp 16, 1, 1, CELADON_MART_3F
 	warp 1, 1, 0, CELADON_MART_ELEVATOR
 
 	db 1 ; signs
@@ -16,6 +16,6 @@ CeladonMart2Object:
 	object SPRITE_GIRL, 14, 4, WALK, 1, 4 ; person
 
 	; warp-to
-	warp_to 12, 1, CELADON_MART_2_WIDTH ; CELADON_MART_1
-	warp_to 16, 1, CELADON_MART_2_WIDTH ; CELADON_MART_3
-	warp_to 1, 1, CELADON_MART_2_WIDTH ; CELADON_MART_ELEVATOR
+	warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F
+	warp_to 16, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_3F
+	warp_to 1, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_ELEVATOR
diff --git a/data/mapObjects/celadonmart3.asm b/data/mapObjects/CeladonMart3F.asm
index 023e3b46..6dfce535 100755
--- a/data/mapObjects/celadonmart3.asm
+++ b/data/mapObjects/CeladonMart3F.asm
@@ -1,9 +1,9 @@
-CeladonMart3Object:
+CeladonMart3F_Object:
 	db $f ; border block
 
 	db 3 ; warps
-	warp 12, 1, 0, CELADON_MART_4
-	warp 16, 1, 1, CELADON_MART_2
+	warp 12, 1, 0, CELADON_MART_4F
+	warp 16, 1, 1, CELADON_MART_2F
 	warp 1, 1, 0, CELADON_MART_ELEVATOR
 
 	db 12 ; signs
@@ -28,6 +28,6 @@ CeladonMart3Object:
 	object SPRITE_YOUNG_BOY, 2, 5, STAY, UP, 5 ; person
 
 	; warp-to
-	warp_to 12, 1, CELADON_MART_3_WIDTH ; CELADON_MART_4
-	warp_to 16, 1, CELADON_MART_3_WIDTH ; CELADON_MART_2
-	warp_to 1, 1, CELADON_MART_3_WIDTH ; CELADON_MART_ELEVATOR
+	warp_to 12, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_4F
+	warp_to 16, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_2F
+	warp_to 1, 1, CELADON_MART_3F_WIDTH ; CELADON_MART_ELEVATOR
diff --git a/data/mapObjects/celadonmart4.asm b/data/mapObjects/CeladonMart4F.asm
index e3ea8955..18ba3bdc 100755
--- a/data/mapObjects/celadonmart4.asm
+++ b/data/mapObjects/CeladonMart4F.asm
@@ -1,9 +1,9 @@
-CeladonMart4Object:
+CeladonMart4F_Object:
 	db $f ; border block
 
 	db 3 ; warps
-	warp 12, 1, 0, CELADON_MART_3
-	warp 16, 1, 1, CELADON_MART_5
+	warp 12, 1, 0, CELADON_MART_3F
+	warp 16, 1, 1, CELADON_MART_5F
 	warp 1, 1, 0, CELADON_MART_ELEVATOR
 
 	db 1 ; signs
@@ -15,6 +15,6 @@ CeladonMart4Object:
 	object SPRITE_BUG_CATCHER, 5, 2, WALK, 2, 3 ; person
 
 	; warp-to
-	warp_to 12, 1, CELADON_MART_4_WIDTH ; CELADON_MART_3
-	warp_to 16, 1, CELADON_MART_4_WIDTH ; CELADON_MART_5
-	warp_to 1, 1, CELADON_MART_4_WIDTH ; CELADON_MART_ELEVATOR
+	warp_to 12, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_3F
+	warp_to 16, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_5F
+	warp_to 1, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_ELEVATOR
diff --git a/data/mapObjects/celadonmart5.asm b/data/mapObjects/CeladonMart5F.asm
index ac2fa454..fb1201c9 100755
--- a/data/mapObjects/celadonmart5.asm
+++ b/data/mapObjects/CeladonMart5F.asm
@@ -1,9 +1,9 @@
-CeladonMart5Object:
+CeladonMart5F_Object:
 	db $f ; border block
 
 	db 3 ; warps
 	warp 12, 1, 0, CELADON_MART_ROOF
-	warp 16, 1, 1, CELADON_MART_4
+	warp 16, 1, 1, CELADON_MART_4F
 	warp 1, 1, 0, CELADON_MART_ELEVATOR
 
 	db 1 ; signs
@@ -16,6 +16,6 @@ CeladonMart5Object:
 	object SPRITE_MART_GUY, 6, 3, STAY, DOWN, 4 ; person
 
 	; warp-to
-	warp_to 12, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ROOF
-	warp_to 16, 1, CELADON_MART_5_WIDTH ; CELADON_MART_4
-	warp_to 1, 1, CELADON_MART_5_WIDTH ; CELADON_MART_ELEVATOR
+	warp_to 12, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ROOF
+	warp_to 16, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_4F
+	warp_to 1, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ELEVATOR
diff --git a/data/mapObjects/CeladonMartElevator.asm b/data/mapObjects/CeladonMartElevator.asm
new file mode 100755
index 00000000..9688daef
--- /dev/null
+++ b/data/mapObjects/CeladonMartElevator.asm
@@ -0,0 +1,15 @@
+CeladonMartElevator_Object:
+	db $f ; border block
+
+	db 2 ; warps
+	warp 1, 3, 5, CELADON_MART_1F
+	warp 2, 3, 5, CELADON_MART_1F
+
+	db 1 ; signs
+	sign 3, 0, 1 ; CeladonMartElevatorText1
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F
+	warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1F
diff --git a/data/mapObjects/celadonmartroof.asm b/data/mapObjects/CeladonMartRoof.asm
index 0268b1ec..05cef2d4 100755
--- a/data/mapObjects/celadonmartroof.asm
+++ b/data/mapObjects/CeladonMartRoof.asm
@@ -1,8 +1,8 @@
-CeladonMartRoofObject:
+CeladonMartRoof_Object:
 	db $42 ; border block
 
 	db 1 ; warps
-	warp 15, 2, 0, CELADON_MART_5
+	warp 15, 2, 0, CELADON_MART_5F
 
 	db 4 ; signs
 	sign 10, 1, 3 ; CeladonMartRoofText3
@@ -15,4 +15,4 @@ CeladonMartRoofObject:
 	object SPRITE_LITTLE_GIRL, 5, 5, WALK, 0, 2 ; person
 
 	; warp-to
-	warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5
+	warp_to 15, 2, CELADON_MART_ROOF_WIDTH ; CELADON_MART_5F
diff --git a/data/mapObjects/celadonpokecenter.asm b/data/mapObjects/CeladonPokecenter.asm
index ab037ec0..da5d595f 100755
--- a/data/mapObjects/celadonpokecenter.asm
+++ b/data/mapObjects/CeladonPokecenter.asm
@@ -1,4 +1,4 @@
-CeladonPokecenterObject:
+CeladonPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/ceruleanhouse2.asm b/data/mapObjects/CeruleanBadgeHouse.asm
index cf54c719..62a6873b 100755
--- a/data/mapObjects/ceruleanhouse2.asm
+++ b/data/mapObjects/CeruleanBadgeHouse.asm
@@ -1,4 +1,4 @@
-CeruleanHouse2Object:
+CeruleanBadgeHouse_Object:
 	db $c ; border block
 
 	db 3 ; warps
@@ -12,6 +12,6 @@ CeruleanHouse2Object:
 	object SPRITE_FAT_BALD_GUY, 5, 3, STAY, RIGHT, 1 ; person
 
 	; warp-to
-	warp_to 2, 0, CERULEAN_HOUSE_2_WIDTH
-	warp_to 2, 7, CERULEAN_HOUSE_2_WIDTH
-	warp_to 3, 7, CERULEAN_HOUSE_2_WIDTH
+	warp_to 2, 0, CERULEAN_BADGE_HOUSE_WIDTH
+	warp_to 2, 7, CERULEAN_BADGE_HOUSE_WIDTH
+	warp_to 3, 7, CERULEAN_BADGE_HOUSE_WIDTH
diff --git a/data/mapObjects/CeruleanCave1F.asm b/data/mapObjects/CeruleanCave1F.asm
new file mode 100755
index 00000000..f9670482
--- /dev/null
+++ b/data/mapObjects/CeruleanCave1F.asm
@@ -0,0 +1,31 @@
+CeruleanCave1F_Object:
+	db $7d ; border block
+
+	db 9 ; warps
+	warp 24, 17, 6, -1
+	warp 25, 17, 6, -1
+	warp 27, 1, 0, CERULEAN_CAVE_2F
+	warp 23, 7, 1, CERULEAN_CAVE_2F
+	warp 18, 9, 2, CERULEAN_CAVE_2F
+	warp 7, 1, 3, CERULEAN_CAVE_2F
+	warp 1, 3, 4, CERULEAN_CAVE_2F
+	warp 3, 11, 5, CERULEAN_CAVE_2F
+	warp 0, 6, 0, CERULEAN_CAVE_B1F
+
+	db 0 ; signs
+
+	db 3 ; objects
+	object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE
+	object SPRITE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER
+	object SPRITE_BALL, 5, 0, STAY, NONE, 3, NUGGET
+
+	; warp-to
+	warp_to 24, 17, CERULEAN_CAVE_1F_WIDTH
+	warp_to 25, 17, CERULEAN_CAVE_1F_WIDTH
+	warp_to 27, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+	warp_to 23, 7, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+	warp_to 18, 9, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+	warp_to 7, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+	warp_to 1, 3, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+	warp_to 3, 11, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
+	warp_to 0, 6, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_B1F
diff --git a/data/mapObjects/CeruleanCave2F.asm b/data/mapObjects/CeruleanCave2F.asm
new file mode 100755
index 00000000..f8312da0
--- /dev/null
+++ b/data/mapObjects/CeruleanCave2F.asm
@@ -0,0 +1,25 @@
+CeruleanCave2F_Object:
+	db $7d ; border block
+
+	db 6 ; warps
+	warp 29, 1, 2, CERULEAN_CAVE_1F
+	warp 22, 6, 3, CERULEAN_CAVE_1F
+	warp 19, 7, 4, CERULEAN_CAVE_1F
+	warp 9, 1, 5, CERULEAN_CAVE_1F
+	warp 1, 3, 6, CERULEAN_CAVE_1F
+	warp 3, 11, 7, CERULEAN_CAVE_1F
+
+	db 0 ; signs
+
+	db 3 ; objects
+	object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP
+	object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL
+	object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE
+
+	; warp-to
+	warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+	warp_to 22, 6, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+	warp_to 19, 7, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+	warp_to 9, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+	warp_to 1, 3, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
+	warp_to 3, 11, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F
diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/CeruleanCaveB1F.asm
index d44ba254..461f77aa 100755
--- a/data/mapObjects/unknowndungeon3.asm
+++ b/data/mapObjects/CeruleanCaveB1F.asm
@@ -1,8 +1,8 @@
-UnknownDungeon3Object:
+CeruleanCaveB1F_Object:
 	db $7d ; border block
 
 	db 1 ; warps
-	warp 3, 6, 8, UNKNOWN_DUNGEON_1
+	warp 3, 6, 8, CERULEAN_CAVE_1F
 
 	db 0 ; signs
 
@@ -12,4 +12,4 @@ UnknownDungeon3Object:
 	object SPRITE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE
 
 	; warp-to
-	warp_to 3, 6, UNKNOWN_DUNGEON_3_WIDTH ; UNKNOWN_DUNGEON_1
+	warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F
diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/CeruleanCity.asm
index 66d18a29..d5adcfd7 100755
--- a/data/mapObjects/ceruleancity.asm
+++ b/data/mapObjects/CeruleanCity.asm
@@ -1,17 +1,17 @@
-CeruleanCityObject:
+CeruleanCity_Object:
 	db $f ; border block
 
 	db 10 ; warps
-	warp 27, 11, 0, TRASHED_HOUSE
-	warp 13, 15, 0, CERULEAN_HOUSE_1
+	warp 27, 11, 0, CERULEAN_TRASHED_HOUSE
+	warp 13, 15, 0, CERULEAN_TRADE_HOUSE
 	warp 19, 17, 0, CERULEAN_POKECENTER
 	warp 30, 19, 0, CERULEAN_GYM
 	warp 13, 25, 0, BIKE_SHOP
 	warp 25, 25, 0, CERULEAN_MART
-	warp 4, 11, 0, UNKNOWN_DUNGEON_1
-	warp 27, 9, 2, TRASHED_HOUSE
-	warp 9, 11, 1, CERULEAN_HOUSE_2
-	warp 9, 9, 0, CERULEAN_HOUSE_2
+	warp 4, 11, 0, CERULEAN_CAVE_1F
+	warp 27, 9, 2, CERULEAN_TRASHED_HOUSE
+	warp 9, 11, 1, CERULEAN_BADGE_HOUSE
+	warp 9, 9, 0, CERULEAN_BADGE_HOUSE
 
 	db 6 ; signs
 	sign 23, 19, 12 ; CeruleanCityText12
@@ -35,13 +35,13 @@ CeruleanCityObject:
 	object SPRITE_GUARD, 27, 12, STAY, DOWN, 11 ; person
 
 	; warp-to
-	warp_to 27, 11, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE
-	warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_1
+	warp_to 27, 11, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE
+	warp_to 13, 15, CERULEAN_CITY_WIDTH ; CERULEAN_TRADE_HOUSE
 	warp_to 19, 17, CERULEAN_CITY_WIDTH ; CERULEAN_POKECENTER
 	warp_to 30, 19, CERULEAN_CITY_WIDTH ; CERULEAN_GYM
 	warp_to 13, 25, CERULEAN_CITY_WIDTH ; BIKE_SHOP
 	warp_to 25, 25, CERULEAN_CITY_WIDTH ; CERULEAN_MART
-	warp_to 4, 11, CERULEAN_CITY_WIDTH ; UNKNOWN_DUNGEON_1
-	warp_to 27, 9, CERULEAN_CITY_WIDTH ; TRASHED_HOUSE
-	warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2
-	warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_HOUSE_2
+	warp_to 4, 11, CERULEAN_CITY_WIDTH ; CERULEAN_CAVE_1F
+	warp_to 27, 9, CERULEAN_CITY_WIDTH ; CERULEAN_TRASHED_HOUSE
+	warp_to 9, 11, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE
+	warp_to 9, 9, CERULEAN_CITY_WIDTH ; CERULEAN_BADGE_HOUSE
diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/CeruleanGym.asm
index d774c5dd..96713648 100755
--- a/data/mapObjects/ceruleangym.asm
+++ b/data/mapObjects/CeruleanGym.asm
@@ -1,4 +1,4 @@
-CeruleanGymObject:
+CeruleanGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/ceruleanmart.asm b/data/mapObjects/CeruleanMart.asm
index 389e0317..4659375f 100755
--- a/data/mapObjects/ceruleanmart.asm
+++ b/data/mapObjects/CeruleanMart.asm
@@ -1,4 +1,4 @@
-CeruleanMartObject:
+CeruleanMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/CeruleanPokecenter.asm
index a6d7a5b5..f65db52c 100755
--- a/data/mapObjects/ceruleanpokecenter.asm
+++ b/data/mapObjects/CeruleanPokecenter.asm
@@ -1,4 +1,4 @@
-CeruleanPokecenterObject:
+CeruleanPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/CeruleanTradeHouse.asm
index a8c636cf..a4a46e9b 100755
--- a/data/mapObjects/ceruleanhouse1.asm
+++ b/data/mapObjects/CeruleanTradeHouse.asm
@@ -1,4 +1,4 @@
-CeruleanHouse1Object:
+CeruleanTradeHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -12,5 +12,5 @@ CeruleanHouse1Object:
 	object SPRITE_GAMBLER, 1, 2, STAY, NONE, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, CERULEAN_HOUSE_1_WIDTH
-	warp_to 3, 7, CERULEAN_HOUSE_1_WIDTH
+	warp_to 2, 7, CERULEAN_TRADE_HOUSE_WIDTH
+	warp_to 3, 7, CERULEAN_TRADE_HOUSE_WIDTH
diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/CeruleanTrashedHouse.asm
index 7b90ff73..44b7cf20 100755
--- a/data/mapObjects/ceruleanhousetrashed.asm
+++ b/data/mapObjects/CeruleanTrashedHouse.asm
@@ -1,4 +1,4 @@
-CeruleanHouseTrashedObject:
+CeruleanTrashedHouse_Object:
 	db $a ; border block
 
 	db 3 ; warps
@@ -14,6 +14,6 @@ CeruleanHouseTrashedObject:
 	object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, TRASHED_HOUSE_WIDTH
-	warp_to 3, 7, TRASHED_HOUSE_WIDTH
-	warp_to 3, 0, TRASHED_HOUSE_WIDTH
+	warp_to 2, 7, CERULEAN_TRASHED_HOUSE_WIDTH
+	warp_to 3, 7, CERULEAN_TRASHED_HOUSE_WIDTH
+	warp_to 3, 0, CERULEAN_TRASHED_HOUSE_WIDTH
diff --git a/data/mapObjects/gary.asm b/data/mapObjects/ChampionsRoom.asm
index 10d9f0ed..1e0cb7f4 100755
--- a/data/mapObjects/gary.asm
+++ b/data/mapObjects/ChampionsRoom.asm
@@ -1,4 +1,4 @@
-GaryObject:
+ChampionsRoom_Object:
 	db $3 ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/cinnabargym.asm b/data/mapObjects/CinnabarGym.asm
index 3fc25a02..ab204d43 100755
--- a/data/mapObjects/cinnabargym.asm
+++ b/data/mapObjects/CinnabarGym.asm
@@ -1,4 +1,4 @@
-CinnabarGymObject:
+CinnabarGym_Object:
 	db $2e ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/cinnabarisland.asm b/data/mapObjects/CinnabarIsland.asm
index a66d6444..1932e134 100755
--- a/data/mapObjects/cinnabarisland.asm
+++ b/data/mapObjects/CinnabarIsland.asm
@@ -1,10 +1,10 @@
-CinnabarIslandObject:
+CinnabarIsland_Object:
 	db $43 ; border block
 
 	db 5 ; warps
-	warp 6, 3, 1, MANSION_1
+	warp 6, 3, 1, POKEMON_MANSION_1F
 	warp 18, 3, 0, CINNABAR_GYM
-	warp 6, 9, 0, CINNABAR_LAB_1
+	warp 6, 9, 0, CINNABAR_LAB
 	warp 11, 11, 0, CINNABAR_POKECENTER
 	warp 15, 11, 0, CINNABAR_MART
 
@@ -20,8 +20,8 @@ CinnabarIslandObject:
 	object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
 
 	; warp-to
-	warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; MANSION_1
+	warp_to 6, 3, CINNABAR_ISLAND_WIDTH ; POKEMON_MANSION_1F
 	warp_to 18, 3, CINNABAR_ISLAND_WIDTH ; CINNABAR_GYM
-	warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB_1
+	warp_to 6, 9, CINNABAR_ISLAND_WIDTH ; CINNABAR_LAB
 	warp_to 11, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_POKECENTER
 	warp_to 15, 11, CINNABAR_ISLAND_WIDTH ; CINNABAR_MART
diff --git a/data/mapObjects/CinnabarLab.asm b/data/mapObjects/CinnabarLab.asm
new file mode 100755
index 00000000..deb5d8ed
--- /dev/null
+++ b/data/mapObjects/CinnabarLab.asm
@@ -0,0 +1,25 @@
+CinnabarLab_Object:
+	db $17 ; border block
+
+	db 5 ; warps
+	warp 2, 7, 2, -1
+	warp 3, 7, 2, -1
+	warp 8, 4, 0, CINNABAR_LAB_TRADE_ROOM
+	warp 12, 4, 0, CINNABAR_LAB_METRONOME_ROOM
+	warp 16, 4, 0, CINNABAR_LAB_FOSSIL_ROOM
+
+	db 4 ; signs
+	sign 3, 2, 2 ; Lab1Text2
+	sign 9, 4, 3 ; Lab1Text3
+	sign 13, 4, 4 ; Lab1Text4
+	sign 17, 4, 5 ; Lab1Text5
+
+	db 1 ; objects
+	object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person
+
+	; warp-to
+	warp_to 2, 7, CINNABAR_LAB_WIDTH
+	warp_to 3, 7, CINNABAR_LAB_WIDTH
+	warp_to 8, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_TRADE_ROOM
+	warp_to 12, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_METRONOME_ROOM
+	warp_to 16, 4, CINNABAR_LAB_WIDTH ; CINNABAR_LAB_FOSSIL_ROOM
diff --git a/data/mapObjects/CinnabarLabFossilRoom.asm b/data/mapObjects/CinnabarLabFossilRoom.asm
new file mode 100755
index 00000000..d31502e6
--- /dev/null
+++ b/data/mapObjects/CinnabarLabFossilRoom.asm
@@ -0,0 +1,16 @@
+CinnabarLabFossilRoom_Object:
+	db $17 ; border block
+
+	db 2 ; warps
+	warp 2, 7, 4, CINNABAR_LAB
+	warp 3, 7, 4, CINNABAR_LAB
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person
+	object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person
+
+	; warp-to
+	warp_to 2, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB
+	warp_to 3, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB
diff --git a/data/mapObjects/lab3.asm b/data/mapObjects/CinnabarLabMetronomeRoom.asm
index 73ba321d..37f93d43 100755
--- a/data/mapObjects/lab3.asm
+++ b/data/mapObjects/CinnabarLabMetronomeRoom.asm
@@ -1,9 +1,9 @@
-Lab3Object:
+CinnabarLabMetronomeRoom_Object:
 	db $17 ; border block
 
 	db 2 ; warps
-	warp 2, 7, 3, CINNABAR_LAB_1
-	warp 3, 7, 3, CINNABAR_LAB_1
+	warp 2, 7, 3, CINNABAR_LAB
+	warp 3, 7, 3, CINNABAR_LAB
 
 	db 3 ; signs
 	sign 0, 4, 3 ; Lab3Text3
@@ -15,5 +15,5 @@ Lab3Object:
 	object SPRITE_OAK_AIDE, 2, 3, WALK, 2, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1
-	warp_to 3, 7, CINNABAR_LAB_3_WIDTH ; CINNABAR_LAB_1
+	warp_to 2, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
+	warp_to 3, 7, CINNABAR_LAB_METRONOME_ROOM_WIDTH ; CINNABAR_LAB
diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/CinnabarLabTradeRoom.asm
index 3062fcae..449cc914 100755
--- a/data/mapObjects/lab2.asm
+++ b/data/mapObjects/CinnabarLabTradeRoom.asm
@@ -1,9 +1,9 @@
-Lab2Object:
+CinnabarLabTradeRoom_Object:
 	db $17 ; border block
 
 	db 2 ; warps
-	warp 2, 7, 2, CINNABAR_LAB_1
-	warp 3, 7, 2, CINNABAR_LAB_1
+	warp 2, 7, 2, CINNABAR_LAB
+	warp 3, 7, 2, CINNABAR_LAB
 
 	db 0 ; signs
 
@@ -13,5 +13,5 @@ Lab2Object:
 	object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1
-	warp_to 3, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1
+	warp_to 2, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
+	warp_to 3, 7, CINNABAR_LAB_TRADE_ROOM_WIDTH ; CINNABAR_LAB
diff --git a/data/mapObjects/cinnabarmart.asm b/data/mapObjects/CinnabarMart.asm
index cf135039..af88ddf0 100755
--- a/data/mapObjects/cinnabarmart.asm
+++ b/data/mapObjects/CinnabarMart.asm
@@ -1,4 +1,4 @@
-CinnabarMartObject:
+CinnabarMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/cinnabarpokecenter.asm b/data/mapObjects/CinnabarPokecenter.asm
index d1707ec7..9583ef2a 100755
--- a/data/mapObjects/cinnabarpokecenter.asm
+++ b/data/mapObjects/CinnabarPokecenter.asm
@@ -1,4 +1,4 @@
-CinnabarPokecenterObject:
+CinnabarPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/Colosseum.asm
index 1c32de2f..18762584 100755
--- a/data/mapObjects/colosseum.asm
+++ b/data/mapObjects/Colosseum.asm
@@ -1,4 +1,4 @@
-ColosseumObject:
+Colosseum_Object:
 	db $e ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/copycatshouse1f.asm b/data/mapObjects/CopycatsHouse1F.asm
index e0e02a8d..cb4dbb0b 100755
--- a/data/mapObjects/copycatshouse1f.asm
+++ b/data/mapObjects/CopycatsHouse1F.asm
@@ -1,4 +1,4 @@
-CopycatsHouse1FObject:
+CopycatsHouse1F_Object:
 	db $a ; border block
 
 	db 3 ; warps
diff --git a/data/mapObjects/copycatshouse2f.asm b/data/mapObjects/CopycatsHouse2F.asm
index 529f3416..18b56419 100755
--- a/data/mapObjects/copycatshouse2f.asm
+++ b/data/mapObjects/CopycatsHouse2F.asm
@@ -1,4 +1,4 @@
-CopycatsHouse2FObject:
+CopycatsHouse2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/daycarem.asm b/data/mapObjects/Daycare.asm
index 7c10fe70..c58c83e4 100755
--- a/data/mapObjects/daycarem.asm
+++ b/data/mapObjects/Daycare.asm
@@ -1,4 +1,4 @@
-DayCareMObject:
+Daycare_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -11,5 +11,5 @@ DayCareMObject:
 	object SPRITE_GENTLEMAN, 2, 3, STAY, RIGHT, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, DAYCAREM_WIDTH
-	warp_to 3, 7, DAYCAREM_WIDTH
+	warp_to 2, 7, DAYCARE_WIDTH
+	warp_to 3, 7, DAYCARE_WIDTH
diff --git a/data/mapObjects/DiglettsCave.asm b/data/mapObjects/DiglettsCave.asm
new file mode 100755
index 00000000..b4fd0af8
--- /dev/null
+++ b/data/mapObjects/DiglettsCave.asm
@@ -0,0 +1,14 @@
+DiglettsCave_Object:
+	db $19 ; border block
+
+	db 2 ; warps
+	warp 5, 5, 2, DIGLETTS_CAVE_ROUTE_2
+	warp 37, 31, 2, DIGLETTS_CAVE_ROUTE_11
+
+	db 0 ; signs
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 5, 5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_2
+	warp_to 37, 31, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ROUTE_11
diff --git a/data/mapObjects/diglettscaveroute11.asm b/data/mapObjects/DiglettsCaveRoute11.asm
index af28bfbf..a4c70f06 100755
--- a/data/mapObjects/diglettscaveroute11.asm
+++ b/data/mapObjects/DiglettsCaveRoute11.asm
@@ -1,4 +1,4 @@
-DiglettsCaveEntranceRoute11Object:
+DiglettsCaveRoute11_Object:
 	db $7d ; border block
 
 	db 3 ; warps
@@ -12,6 +12,6 @@ DiglettsCaveEntranceRoute11Object:
 	object SPRITE_GAMBLER, 2, 3, STAY, NONE, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, DIGLETTS_CAVE_ENTRANCE_WIDTH
-	warp_to 3, 7, DIGLETTS_CAVE_ENTRANCE_WIDTH
-	warp_to 4, 4, DIGLETTS_CAVE_ENTRANCE_WIDTH ; DIGLETTS_CAVE
+	warp_to 2, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH
+	warp_to 3, 7, DIGLETTS_CAVE_ROUTE_11_WIDTH
+	warp_to 4, 4, DIGLETTS_CAVE_ROUTE_11_WIDTH ; DIGLETTS_CAVE
diff --git a/data/mapObjects/diglettscaveroute2.asm b/data/mapObjects/DiglettsCaveRoute2.asm
index 645cc385..0567fee6 100755
--- a/data/mapObjects/diglettscaveroute2.asm
+++ b/data/mapObjects/DiglettsCaveRoute2.asm
@@ -1,4 +1,4 @@
-DiglettsCaveRoute2Object:
+DiglettsCaveRoute2_Object:
 	db $7d ; border block
 
 	db 3 ; warps
@@ -12,6 +12,6 @@ DiglettsCaveRoute2Object:
 	object SPRITE_FISHER, 3, 3, STAY, NONE, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, DIGLETTS_CAVE_EXIT_WIDTH
-	warp_to 3, 7, DIGLETTS_CAVE_EXIT_WIDTH
-	warp_to 4, 4, DIGLETTS_CAVE_EXIT_WIDTH ; DIGLETTS_CAVE
+	warp_to 2, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH
+	warp_to 3, 7, DIGLETTS_CAVE_ROUTE_2_WIDTH
+	warp_to 4, 4, DIGLETTS_CAVE_ROUTE_2_WIDTH ; DIGLETTS_CAVE
diff --git a/data/mapObjects/fightingdojo.asm b/data/mapObjects/FightingDojo.asm
index b9ff9449..fdc7b838 100755
--- a/data/mapObjects/fightingdojo.asm
+++ b/data/mapObjects/FightingDojo.asm
@@ -1,4 +1,4 @@
-FightingDojoObject:
+FightingDojo_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/fuchsiahouse1.asm b/data/mapObjects/FuchsiaBillsGrandpasHouse.asm
index ca4638f9..363b56f9 100755
--- a/data/mapObjects/fuchsiahouse1.asm
+++ b/data/mapObjects/FuchsiaBillsGrandpasHouse.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse1Object:
+FuchsiaBillsGrandpasHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ FuchsiaHouse1Object:
 	object SPRITE_BUG_CATCHER, 5, 5, STAY, NONE, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, FUCHSIA_HOUSE_1_WIDTH
-	warp_to 3, 7, FUCHSIA_HOUSE_1_WIDTH
+	warp_to 2, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH
+	warp_to 3, 7, FUCHSIA_BILLS_GRANDPAS_HOUSE_WIDTH
diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/FuchsiaCity.asm
index c89c03cd..09c97b02 100755
--- a/data/mapObjects/fuchsiacity.asm
+++ b/data/mapObjects/FuchsiaCity.asm
@@ -1,16 +1,16 @@
-FuchsiaCityObject:
+FuchsiaCity_Object:
 	db $f ; border block
 
 	db 9 ; warps
 	warp 5, 13, 0, FUCHSIA_MART
-	warp 11, 27, 0, FUCHSIA_HOUSE_1
+	warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE
 	warp 19, 27, 0, FUCHSIA_POKECENTER
-	warp 27, 27, 0, FUCHSIA_HOUSE_2
-	warp 18, 3, 0, SAFARI_ZONE_ENTRANCE
+	warp 27, 27, 0, WARDENS_HOUSE
+	warp 18, 3, 0, SAFARI_ZONE_GATE
 	warp 5, 27, 0, FUCHSIA_GYM
 	warp 22, 13, 0, FUCHSIA_MEETING_ROOM
-	warp 31, 27, 1, FUCHSIA_HOUSE_3
-	warp 31, 24, 0, FUCHSIA_HOUSE_3
+	warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE
+	warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE
 
 	db 14 ; signs
 	sign 15, 23, 11 ; FuchsiaCityText11
@@ -42,11 +42,11 @@ FuchsiaCityObject:
 
 	; warp-to
 	warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART
-	warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_1
+	warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_BILLS_GRANDPAS_HOUSE
 	warp_to 19, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER
-	warp_to 27, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_2
-	warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_ENTRANCE
+	warp_to 27, 27, FUCHSIA_CITY_WIDTH ; WARDENS_HOUSE
+	warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_GATE
 	warp_to 5, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM
 	warp_to 22, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM
-	warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3
-	warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3
+	warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE
+	warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE
diff --git a/data/mapObjects/fuchsiahouse3.asm b/data/mapObjects/FuchsiaGoodRodHouse.asm
index 0bed500b..390447c8 100755
--- a/data/mapObjects/fuchsiahouse3.asm
+++ b/data/mapObjects/FuchsiaGoodRodHouse.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse3Object:
+FuchsiaGoodRodHouse_Object:
 	db $c ; border block
 
 	db 3 ; warps
@@ -12,6 +12,6 @@ FuchsiaHouse3Object:
 	object SPRITE_FISHER, 5, 3, STAY, RIGHT, 1 ; person
 
 	; warp-to
-	warp_to 2, 0, FUCHSIA_HOUSE_3_WIDTH
-	warp_to 2, 7, FUCHSIA_HOUSE_3_WIDTH
-	warp_to 3, 7, FUCHSIA_HOUSE_3_WIDTH
+	warp_to 2, 0, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
+	warp_to 2, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
+	warp_to 3, 7, FUCHSIA_GOOD_ROD_HOUSE_WIDTH
diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/FuchsiaGym.asm
index 23314fb9..5d707d53 100755
--- a/data/mapObjects/fuchsiagym.asm
+++ b/data/mapObjects/FuchsiaGym.asm
@@ -1,4 +1,4 @@
-FuchsiaGymObject:
+FuchsiaGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/fuchsiamart.asm b/data/mapObjects/FuchsiaMart.asm
index bfb93979..cfa71d8d 100755
--- a/data/mapObjects/fuchsiamart.asm
+++ b/data/mapObjects/FuchsiaMart.asm
@@ -1,4 +1,4 @@
-FuchsiaMartObject:
+FuchsiaMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/fuchsiameetingroom.asm b/data/mapObjects/FuchsiaMeetingRoom.asm
index c6c10415..9130d920 100755
--- a/data/mapObjects/fuchsiameetingroom.asm
+++ b/data/mapObjects/FuchsiaMeetingRoom.asm
@@ -1,4 +1,4 @@
-FuchsiaMeetingRoomObject:
+FuchsiaMeetingRoom_Object:
 	db $17 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/fuchsiapokecenter.asm b/data/mapObjects/FuchsiaPokecenter.asm
index 12540cd3..73dc529d 100755
--- a/data/mapObjects/fuchsiapokecenter.asm
+++ b/data/mapObjects/FuchsiaPokecenter.asm
@@ -1,4 +1,4 @@
-FuchsiaPokecenterObject:
+FuchsiaPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/GameCorner.asm
index a09691d6..2704f6ab 100755
--- a/data/mapObjects/celadongamecorner.asm
+++ b/data/mapObjects/GameCorner.asm
@@ -1,10 +1,10 @@
-CeladonGameCornerObject:
+GameCorner_Object:
 	db $f ; border block
 
 	db 3 ; warps
 	warp 15, 17, 7, -1
 	warp 16, 17, 7, -1
-	warp 17, 4, 1, ROCKET_HIDEOUT_1
+	warp 17, 4, 1, ROCKET_HIDEOUT_B1F
 
 	db 1 ; signs
 	sign 9, 4, 12 ; CeladonGameCornerText12
@@ -25,4 +25,4 @@ CeladonGameCornerObject:
 	; warp-to
 	warp_to 15, 17, GAME_CORNER_WIDTH
 	warp_to 16, 17, GAME_CORNER_WIDTH
-	warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_1
+	warp_to 17, 4, GAME_CORNER_WIDTH ; ROCKET_HIDEOUT_B1F
diff --git a/data/mapObjects/celadonprizeroom.asm b/data/mapObjects/GameCornerPrizeRoom.asm
index bdaafe02..35cd3ac8 100755
--- a/data/mapObjects/celadonprizeroom.asm
+++ b/data/mapObjects/GameCornerPrizeRoom.asm
@@ -1,4 +1,4 @@
-CeladonPrizeRoomObject:
+GameCornerPrizeRoom_Object:
 	db $f ; border block
 
 	db 2 ; warps
@@ -15,5 +15,5 @@ CeladonPrizeRoomObject:
 	object SPRITE_GAMBLER, 7, 3, WALK, 2, 2 ; person
 
 	; warp-to
-	warp_to 4, 7, CELADON_PRIZE_ROOM_WIDTH
-	warp_to 5, 7, CELADON_PRIZE_ROOM_WIDTH
+	warp_to 4, 7, GAME_CORNER_PRIZE_ROOM_WIDTH
+	warp_to 5, 7, GAME_CORNER_PRIZE_ROOM_WIDTH
diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/HallOfFame.asm
index a815a053..3762d871 100755
--- a/data/mapObjects/halloffameroom.asm
+++ b/data/mapObjects/HallOfFame.asm
@@ -1,4 +1,4 @@
-HallofFameRoomObject:
+HallOfFame_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/indigoplateau.asm b/data/mapObjects/IndigoPlateau.asm
index d18f25e1..1447be11 100755
--- a/data/mapObjects/indigoplateau.asm
+++ b/data/mapObjects/IndigoPlateau.asm
@@ -1,4 +1,4 @@
-IndigoPlateauObject:
+IndigoPlateau_Object:
 	db $e ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/indigoplateaulobby.asm b/data/mapObjects/IndigoPlateauLobby.asm
index d82256a1..ea113a16 100755
--- a/data/mapObjects/indigoplateaulobby.asm
+++ b/data/mapObjects/IndigoPlateauLobby.asm
@@ -1,4 +1,4 @@
-IndigoPlateauLobbyObject:
+IndigoPlateauLobby_Object:
 	db $0 ; border block
 
 	db 3 ; warps
diff --git a/data/mapObjects/lance.asm b/data/mapObjects/LancesRoom.asm
index 77c0058c..6f22631a 100755
--- a/data/mapObjects/lance.asm
+++ b/data/mapObjects/LancesRoom.asm
@@ -1,4 +1,4 @@
-LanceObject:
+LancesRoom_Object:
 	db $3 ; border block
 
 	db 3 ; warps
diff --git a/data/mapObjects/lavenderhouse2.asm b/data/mapObjects/LavenderCuboneHouse.asm
index 6d900f45..96f1b3ba 100755
--- a/data/mapObjects/lavenderhouse2.asm
+++ b/data/mapObjects/LavenderCuboneHouse.asm
@@ -1,4 +1,4 @@
-LavenderHouse2Object:
+LavenderCuboneHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -12,5 +12,5 @@ LavenderHouse2Object:
 	object SPRITE_BRUNETTE_GIRL, 2, 4, STAY, RIGHT, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, LAVENDER_HOUSE_2_WIDTH
-	warp_to 3, 7, LAVENDER_HOUSE_2_WIDTH
+	warp_to 2, 7, LAVENDER_CUBONE_HOUSE_WIDTH
+	warp_to 3, 7, LAVENDER_CUBONE_HOUSE_WIDTH
diff --git a/data/mapObjects/lavendermart.asm b/data/mapObjects/LavenderMart.asm
index 6661fee9..df14ad39 100755
--- a/data/mapObjects/lavendermart.asm
+++ b/data/mapObjects/LavenderMart.asm
@@ -1,4 +1,4 @@
-LavenderMartObject:
+LavenderMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/lavenderpokecenter.asm b/data/mapObjects/LavenderPokecenter.asm
index b3eea8ec..89e25571 100755
--- a/data/mapObjects/lavenderpokecenter.asm
+++ b/data/mapObjects/LavenderPokecenter.asm
@@ -1,4 +1,4 @@
-LavenderPokecenterObject:
+LavenderPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/LavenderTown.asm
index 5788c4f3..4aead666 100755
--- a/data/mapObjects/lavendertown.asm
+++ b/data/mapObjects/LavenderTown.asm
@@ -1,12 +1,12 @@
-LavenderTownObject:
+LavenderTown_Object:
 	db $2c ; border block
 
 	db 6 ; warps
 	warp 3, 5, 0, LAVENDER_POKECENTER
-	warp 14, 5, 0, POKEMONTOWER_1
-	warp 7, 9, 0, LAVENDER_HOUSE_1
+	warp 14, 5, 0, POKEMON_TOWER_1F
+	warp 7, 9, 0, MR_FUJIS_HOUSE
 	warp 15, 13, 0, LAVENDER_MART
-	warp 3, 13, 0, LAVENDER_HOUSE_2
+	warp 3, 13, 0, LAVENDER_CUBONE_HOUSE
 	warp 7, 13, 0, NAME_RATERS_HOUSE
 
 	db 6 ; signs
@@ -24,8 +24,8 @@ LavenderTownObject:
 
 	; warp-to
 	warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER
-	warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMONTOWER_1
-	warp_to 7, 9, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_1
+	warp_to 14, 5, LAVENDER_TOWN_WIDTH ; POKEMON_TOWER_1F
+	warp_to 7, 9, LAVENDER_TOWN_WIDTH ; MR_FUJIS_HOUSE
 	warp_to 15, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_MART
-	warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_HOUSE_2
+	warp_to 3, 13, LAVENDER_TOWN_WIDTH ; LAVENDER_CUBONE_HOUSE
 	warp_to 7, 13, LAVENDER_TOWN_WIDTH ; NAME_RATERS_HOUSE
diff --git a/data/mapObjects/lorelei.asm b/data/mapObjects/LoreleisRoom.asm
index e5f0f9f2..06450bb4 100755
--- a/data/mapObjects/lorelei.asm
+++ b/data/mapObjects/LoreleisRoom.asm
@@ -1,4 +1,4 @@
-LoreleiObject:
+LoreleisRoom_Object:
 	db $3 ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/lavenderhouse1.asm b/data/mapObjects/MrFujisHouse.asm
index d9b61302..5b6ca2a6 100755
--- a/data/mapObjects/lavenderhouse1.asm
+++ b/data/mapObjects/MrFujisHouse.asm
@@ -1,4 +1,4 @@
-LavenderHouse1Object:
+MrFujisHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -16,5 +16,5 @@ LavenderHouse1Object:
 	object SPRITE_BOOK_MAP_DEX, 3, 3, STAY, NONE, 6 ; person
 
 	; warp-to
-	warp_to 2, 7, LAVENDER_HOUSE_1_WIDTH
-	warp_to 3, 7, LAVENDER_HOUSE_1_WIDTH
+	warp_to 2, 7, MR_FUJIS_HOUSE_WIDTH
+	warp_to 3, 7, MR_FUJIS_HOUSE_WIDTH
diff --git a/data/mapObjects/saffronhouse2.asm b/data/mapObjects/MrPsychicsHouse.asm
index ac1827b9..01f9e11c 100755
--- a/data/mapObjects/saffronhouse2.asm
+++ b/data/mapObjects/MrPsychicsHouse.asm
@@ -1,4 +1,4 @@
-SaffronHouse2Object:
+MrPsychicsHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -11,5 +11,5 @@ SaffronHouse2Object:
 	object SPRITE_FISHER, 5, 3, STAY, LEFT, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, SAFFRON_HOUSE_2_WIDTH
-	warp_to 3, 7, SAFFRON_HOUSE_2_WIDTH
+	warp_to 2, 7, MR_PSYCHICS_HOUSE_WIDTH
+	warp_to 3, 7, MR_PSYCHICS_HOUSE_WIDTH
diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/MtMoon1F.asm
index 707281aa..56820161 100755
--- a/data/mapObjects/mtmoon1.asm
+++ b/data/mapObjects/MtMoon1F.asm
@@ -1,12 +1,12 @@
-MtMoon1Object:
+MtMoon1F_Object:
 	db $3 ; border block
 
 	db 5 ; warps
 	warp 14, 35, 1, -1
 	warp 15, 35, 1, -1
-	warp 5, 5, 0, MT_MOON_2
-	warp 17, 11, 2, MT_MOON_2
-	warp 25, 15, 3, MT_MOON_2
+	warp 5, 5, 0, MT_MOON_B1F
+	warp 17, 11, 2, MT_MOON_B1F
+	warp 25, 15, 3, MT_MOON_B1F
 
 	db 1 ; signs
 	sign 15, 23, 14 ; MtMoon1Text14
@@ -27,8 +27,8 @@ MtMoon1Object:
 	object SPRITE_BALL, 5, 32, STAY, NONE, 13, TM_12
 
 	; warp-to
-	warp_to 14, 35, MT_MOON_1_WIDTH
-	warp_to 15, 35, MT_MOON_1_WIDTH
-	warp_to 5, 5, MT_MOON_1_WIDTH ; MT_MOON_2
-	warp_to 17, 11, MT_MOON_1_WIDTH ; MT_MOON_2
-	warp_to 25, 15, MT_MOON_1_WIDTH ; MT_MOON_2
+	warp_to 14, 35, MT_MOON_1F_WIDTH
+	warp_to 15, 35, MT_MOON_1F_WIDTH
+	warp_to 5, 5, MT_MOON_1F_WIDTH ; MT_MOON_B1F
+	warp_to 17, 11, MT_MOON_1F_WIDTH ; MT_MOON_B1F
+	warp_to 25, 15, MT_MOON_1F_WIDTH ; MT_MOON_B1F
diff --git a/data/mapObjects/MtMoonB1F.asm b/data/mapObjects/MtMoonB1F.asm
new file mode 100755
index 00000000..a8365ba7
--- /dev/null
+++ b/data/mapObjects/MtMoonB1F.asm
@@ -0,0 +1,26 @@
+MtMoonB1F_Object:
+	db $3 ; border block
+
+	db 8 ; warps
+	warp 5, 5, 2, MT_MOON_1F
+	warp 17, 11, 0, MT_MOON_B2F
+	warp 25, 9, 3, MT_MOON_1F
+	warp 25, 15, 4, MT_MOON_1F
+	warp 21, 17, 1, MT_MOON_B2F
+	warp 13, 27, 2, MT_MOON_B2F
+	warp 23, 3, 3, MT_MOON_B2F
+	warp 27, 3, 2, -1
+
+	db 0 ; signs
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 5, 5, MT_MOON_B1F_WIDTH ; MT_MOON_1F
+	warp_to 17, 11, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
+	warp_to 25, 9, MT_MOON_B1F_WIDTH ; MT_MOON_1F
+	warp_to 25, 15, MT_MOON_B1F_WIDTH ; MT_MOON_1F
+	warp_to 21, 17, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
+	warp_to 13, 27, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
+	warp_to 23, 3, MT_MOON_B1F_WIDTH ; MT_MOON_B2F
+	warp_to 27, 3, MT_MOON_B1F_WIDTH
diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/MtMoonB2F.asm
index 13aa5a79..27b2383f 100755
--- a/data/mapObjects/mtmoon3.asm
+++ b/data/mapObjects/MtMoonB2F.asm
@@ -1,11 +1,11 @@
-MtMoon3Object:
+MtMoonB2F_Object:
 	db $3 ; border block
 
 	db 4 ; warps
-	warp 25, 9, 1, MT_MOON_2
-	warp 21, 17, 4, MT_MOON_2
-	warp 15, 27, 5, MT_MOON_2
-	warp 5, 7, 6, MT_MOON_2
+	warp 25, 9, 1, MT_MOON_B1F
+	warp 21, 17, 4, MT_MOON_B1F
+	warp 15, 27, 5, MT_MOON_B1F
+	warp 5, 7, 6, MT_MOON_B1F
 
 	db 0 ; signs
 
@@ -21,7 +21,7 @@ MtMoon3Object:
 	object SPRITE_BALL, 29, 5, STAY, NONE, 9, TM_01
 
 	; warp-to
-	warp_to 25, 9, MT_MOON_3_WIDTH ; MT_MOON_2
-	warp_to 21, 17, MT_MOON_3_WIDTH ; MT_MOON_2
-	warp_to 15, 27, MT_MOON_3_WIDTH ; MT_MOON_2
-	warp_to 5, 7, MT_MOON_3_WIDTH ; MT_MOON_2
+	warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
+	warp_to 21, 17, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
+	warp_to 15, 27, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
+	warp_to 5, 7, MT_MOON_B2F_WIDTH ; MT_MOON_B1F
diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/MtMoonPokecenter.asm
index 841d0194..b23703e6 100755
--- a/data/mapObjects/mtmoonpokecenter.asm
+++ b/data/mapObjects/MtMoonPokecenter.asm
@@ -1,4 +1,4 @@
-MtMoonPokecenterObject:
+MtMoonPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/museum1f.asm b/data/mapObjects/Museum1F.asm
index 3034dc74..1cfd2c68 100755
--- a/data/mapObjects/museum1f.asm
+++ b/data/mapObjects/Museum1F.asm
@@ -1,4 +1,4 @@
-Museum1FObject:
+Museum1F_Object:
 	db $a ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/museum2f.asm b/data/mapObjects/Museum2F.asm
index 11fad941..80815820 100755
--- a/data/mapObjects/museum2f.asm
+++ b/data/mapObjects/Museum2F.asm
@@ -1,4 +1,4 @@
-Museum2FObject:
+Museum2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/namerater.asm b/data/mapObjects/NameRatersHouse.asm
index 10487f0b..da95bc43 100755
--- a/data/mapObjects/namerater.asm
+++ b/data/mapObjects/NameRatersHouse.asm
@@ -1,4 +1,4 @@
-NameRaterObject:
+NameRatersHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/oakslab.asm b/data/mapObjects/OaksLab.asm
index d7fc8029..fa78ccdf 100755
--- a/data/mapObjects/oakslab.asm
+++ b/data/mapObjects/OaksLab.asm
@@ -1,4 +1,4 @@
-OaksLabObject:
+OaksLab_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/pallettown.asm b/data/mapObjects/PalletTown.asm
index 1bd3d62b..68b01175 100755
--- a/data/mapObjects/pallettown.asm
+++ b/data/mapObjects/PalletTown.asm
@@ -1,4 +1,4 @@
-PalletTownObject:
+PalletTown_Object:
 	db $b ; border block
 
 	db 3 ; warps
diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/PewterCity.asm
index 4e7d24d0..e1a3eecb 100755
--- a/data/mapObjects/pewtercity.asm
+++ b/data/mapObjects/PewterCity.asm
@@ -1,13 +1,13 @@
-PewterCityObject:
+PewterCity_Object:
 	db $a ; border block
 
 	db 7 ; warps
 	warp 14, 7, 0, MUSEUM_1F
 	warp 19, 5, 2, MUSEUM_1F
 	warp 16, 17, 0, PEWTER_GYM
-	warp 29, 13, 0, PEWTER_HOUSE_1
+	warp 29, 13, 0, PEWTER_NIDORAN_HOUSE
 	warp 23, 17, 0, PEWTER_MART
-	warp 7, 29, 0, PEWTER_HOUSE_2
+	warp 7, 29, 0, PEWTER_SPEECH_HOUSE
 	warp 13, 25, 0, PEWTER_POKECENTER
 
 	db 7 ; signs
@@ -30,7 +30,7 @@ PewterCityObject:
 	warp_to 14, 7, PEWTER_CITY_WIDTH ; MUSEUM_1F
 	warp_to 19, 5, PEWTER_CITY_WIDTH ; MUSEUM_1F
 	warp_to 16, 17, PEWTER_CITY_WIDTH ; PEWTER_GYM
-	warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_1
+	warp_to 29, 13, PEWTER_CITY_WIDTH ; PEWTER_NIDORAN_HOUSE
 	warp_to 23, 17, PEWTER_CITY_WIDTH ; PEWTER_MART
-	warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_HOUSE_2
+	warp_to 7, 29, PEWTER_CITY_WIDTH ; PEWTER_SPEECH_HOUSE
 	warp_to 13, 25, PEWTER_CITY_WIDTH ; PEWTER_POKECENTER
diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/PewterGym.asm
index fc571f26..538c3923 100755
--- a/data/mapObjects/pewtergym.asm
+++ b/data/mapObjects/PewterGym.asm
@@ -1,4 +1,4 @@
-PewterGymObject:
+PewterGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/pewtermart.asm b/data/mapObjects/PewterMart.asm
index e79952c9..9b983316 100755
--- a/data/mapObjects/pewtermart.asm
+++ b/data/mapObjects/PewterMart.asm
@@ -1,4 +1,4 @@
-PewterMartObject:
+PewterMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/pewterhouse1.asm b/data/mapObjects/PewterNidoranHouse.asm
index 63abe6b3..f00317d1 100755
--- a/data/mapObjects/pewterhouse1.asm
+++ b/data/mapObjects/PewterNidoranHouse.asm
@@ -1,4 +1,4 @@
-PewterHouse1Object:
+PewterNidoranHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ PewterHouse1Object:
 	object SPRITE_FAT_BALD_GUY, 1, 2, STAY, NONE, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, PEWTER_HOUSE_1_WIDTH
-	warp_to 3, 7, PEWTER_HOUSE_1_WIDTH
+	warp_to 2, 7, PEWTER_NIDORAN_HOUSE_WIDTH
+	warp_to 3, 7, PEWTER_NIDORAN_HOUSE_WIDTH
diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/PewterPokecenter.asm
index 29f02eb9..2b375bf9 100755
--- a/data/mapObjects/pewterpokecenter.asm
+++ b/data/mapObjects/PewterPokecenter.asm
@@ -1,4 +1,4 @@
-PewterPokecenterObject:
+PewterPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/pewterhouse2.asm b/data/mapObjects/PewterSpeechHouse.asm
index 48cb243d..e7134cb5 100755
--- a/data/mapObjects/pewterhouse2.asm
+++ b/data/mapObjects/PewterSpeechHouse.asm
@@ -1,4 +1,4 @@
-PewterHouse2Object:
+PewterSpeechHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -12,5 +12,5 @@ PewterHouse2Object:
 	object SPRITE_BUG_CATCHER, 4, 5, STAY, NONE, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, PEWTER_HOUSE_2_WIDTH
-	warp_to 3, 7, PEWTER_HOUSE_2_WIDTH
+	warp_to 2, 7, PEWTER_SPEECH_HOUSE_WIDTH
+	warp_to 3, 7, PEWTER_SPEECH_HOUSE_WIDTH
diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/PokemonFanClub.asm
index 8e0fd931..e1f175f0 100755
--- a/data/mapObjects/fanclub.asm
+++ b/data/mapObjects/PokemonFanClub.asm
@@ -1,4 +1,4 @@
-FanClubObject:
+PokemonFanClub_Object:
 	db $d ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/PokemonMansion1F.asm b/data/mapObjects/PokemonMansion1F.asm
new file mode 100755
index 00000000..109b5b8e
--- /dev/null
+++ b/data/mapObjects/PokemonMansion1F.asm
@@ -0,0 +1,29 @@
+PokemonMansion1F_Object:
+	db $2e ; border block
+
+	db 8 ; warps
+	warp 4, 27, 0, -1
+	warp 5, 27, 0, -1
+	warp 6, 27, 0, -1
+	warp 7, 27, 0, -1
+	warp 5, 10, 0, POKEMON_MANSION_2F
+	warp 21, 23, 0, POKEMON_MANSION_B1F
+	warp 26, 27, 0, -1
+	warp 27, 27, 0, -1
+
+	db 0 ; signs
+
+	db 3 ; objects
+	object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4
+	object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE
+	object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS
+
+	; warp-to
+	warp_to 4, 27, POKEMON_MANSION_1F_WIDTH
+	warp_to 5, 27, POKEMON_MANSION_1F_WIDTH
+	warp_to 6, 27, POKEMON_MANSION_1F_WIDTH
+	warp_to 7, 27, POKEMON_MANSION_1F_WIDTH
+	warp_to 5, 10, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_2F
+	warp_to 21, 23, POKEMON_MANSION_1F_WIDTH ; POKEMON_MANSION_B1F
+	warp_to 26, 27, POKEMON_MANSION_1F_WIDTH
+	warp_to 27, 27, POKEMON_MANSION_1F_WIDTH
diff --git a/data/mapObjects/PokemonMansion2F.asm b/data/mapObjects/PokemonMansion2F.asm
new file mode 100755
index 00000000..6c0cc5f8
--- /dev/null
+++ b/data/mapObjects/PokemonMansion2F.asm
@@ -0,0 +1,22 @@
+PokemonMansion2F_Object:
+	db $1 ; border block
+
+	db 4 ; warps
+	warp 5, 10, 4, POKEMON_MANSION_1F
+	warp 7, 10, 0, POKEMON_MANSION_3F
+	warp 25, 14, 2, POKEMON_MANSION_3F
+	warp 6, 1, 1, POKEMON_MANSION_3F
+
+	db 0 ; signs
+
+	db 4 ; objects
+	object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7
+	object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM
+	object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person
+	object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person
+
+	; warp-to
+	warp_to 5, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_1F
+	warp_to 7, 10, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
+	warp_to 25, 14, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
+	warp_to 6, 1, POKEMON_MANSION_2F_WIDTH ; POKEMON_MANSION_3F
diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/PokemonMansion3F.asm
index f6ec7aee..7c8c9c22 100755
--- a/data/mapObjects/mansion3.asm
+++ b/data/mapObjects/PokemonMansion3F.asm
@@ -1,10 +1,10 @@
-Mansion3Object:
+PokemonMansion3F_Object:
 	db $1 ; border block
 
 	db 3 ; warps
-	warp 7, 10, 1, MANSION_2
-	warp 6, 1, 3, MANSION_2
-	warp 25, 14, 2, MANSION_2
+	warp 7, 10, 1, POKEMON_MANSION_2F
+	warp 6, 1, 3, POKEMON_MANSION_2F
+	warp 25, 14, 2, POKEMON_MANSION_2F
 
 	db 0 ; signs
 
@@ -16,6 +16,6 @@ Mansion3Object:
 	object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person
 
 	; warp-to
-	warp_to 7, 10, MANSION_3_WIDTH ; MANSION_2
-	warp_to 6, 1, MANSION_3_WIDTH ; MANSION_2
-	warp_to 25, 14, MANSION_3_WIDTH ; MANSION_2
+	warp_to 7, 10, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
+	warp_to 6, 1, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
+	warp_to 25, 14, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F
diff --git a/data/mapObjects/mansion4.asm b/data/mapObjects/PokemonMansionB1F.asm
index 3db9d016..ac232799 100755
--- a/data/mapObjects/mansion4.asm
+++ b/data/mapObjects/PokemonMansionB1F.asm
@@ -1,8 +1,8 @@
-Mansion4Object:
+PokemonMansionB1F_Object:
 	db $1 ; border block
 
 	db 1 ; warps
-	warp 23, 22, 5, MANSION_1
+	warp 23, 22, 5, POKEMON_MANSION_1F
 
 	db 0 ; signs
 
@@ -17,4 +17,4 @@ Mansion4Object:
 	object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY
 
 	; warp-to
-	warp_to 23, 22, MANSION_4_WIDTH ; MANSION_1
+	warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F
diff --git a/data/mapObjects/pokemontower1.asm b/data/mapObjects/PokemonTower1F.asm
index f15299da..cf62836b 100755
--- a/data/mapObjects/pokemontower1.asm
+++ b/data/mapObjects/PokemonTower1F.asm
@@ -1,10 +1,10 @@
-PokemonTower1Object:
+PokemonTower1F_Object:
 	db $1 ; border block
 
 	db 3 ; warps
 	warp 10, 17, 1, -1
 	warp 11, 17, 1, -1
-	warp 18, 9, 1, POKEMONTOWER_2
+	warp 18, 9, 1, POKEMON_TOWER_2F
 
 	db 0 ; signs
 
@@ -16,6 +16,6 @@ PokemonTower1Object:
 	object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person
 
 	; warp-to
-	warp_to 10, 17, POKEMONTOWER_1_WIDTH
-	warp_to 11, 17, POKEMONTOWER_1_WIDTH
-	warp_to 18, 9, POKEMONTOWER_1_WIDTH ; POKEMONTOWER_2
+	warp_to 10, 17, POKEMON_TOWER_1F_WIDTH
+	warp_to 11, 17, POKEMON_TOWER_1F_WIDTH
+	warp_to 18, 9, POKEMON_TOWER_1F_WIDTH ; POKEMON_TOWER_2F
diff --git a/data/mapObjects/PokemonTower2F.asm b/data/mapObjects/PokemonTower2F.asm
new file mode 100755
index 00000000..5ce437d1
--- /dev/null
+++ b/data/mapObjects/PokemonTower2F.asm
@@ -0,0 +1,16 @@
+PokemonTower2F_Object:
+	db $1 ; border block
+
+	db 2 ; warps
+	warp 3, 9, 0, POKEMON_TOWER_3F
+	warp 18, 9, 2, POKEMON_TOWER_1F
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person
+	object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person
+
+	; warp-to
+	warp_to 3, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_3F
+	warp_to 18, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_1F
diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/PokemonTower3F.asm
index 0e7f5e1f..79b83f88 100755
--- a/data/mapObjects/pokemontower3.asm
+++ b/data/mapObjects/PokemonTower3F.asm
@@ -1,9 +1,9 @@
-PokemonTower3Object:
+PokemonTower3F_Object:
 	db $1 ; border block
 
 	db 2 ; warps
-	warp 3, 9, 0, POKEMONTOWER_2
-	warp 18, 9, 1, POKEMONTOWER_4
+	warp 3, 9, 0, POKEMON_TOWER_2F
+	warp 18, 9, 1, POKEMON_TOWER_4F
 
 	db 0 ; signs
 
@@ -14,5 +14,5 @@ PokemonTower3Object:
 	object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE
 
 	; warp-to
-	warp_to 3, 9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_2
-	warp_to 18, 9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_4
+	warp_to 3, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_2F
+	warp_to 18, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_4F
diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/PokemonTower4F.asm
index 9acea43e..db86c02c 100755
--- a/data/mapObjects/pokemontower4.asm
+++ b/data/mapObjects/PokemonTower4F.asm
@@ -1,9 +1,9 @@
-PokemonTower4Object:
+PokemonTower4F_Object:
 	db $1 ; border block
 
 	db 2 ; warps
-	warp 3, 9, 0, POKEMONTOWER_5
-	warp 18, 9, 1, POKEMONTOWER_3
+	warp 3, 9, 0, POKEMON_TOWER_5F
+	warp 18, 9, 1, POKEMON_TOWER_3F
 
 	db 0 ; signs
 
@@ -16,5 +16,5 @@ PokemonTower4Object:
 	object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP
 
 	; warp-to
-	warp_to 3, 9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_5
-	warp_to 18, 9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_3
+	warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F
+	warp_to 18, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_3F
diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/PokemonTower5F.asm
index ac0668b2..b482871f 100755
--- a/data/mapObjects/pokemontower5.asm
+++ b/data/mapObjects/PokemonTower5F.asm
@@ -1,9 +1,9 @@
-PokemonTower5Object:
+PokemonTower5F_Object:
 	db $1 ; border block
 
 	db 2 ; warps
-	warp 3, 9, 0, POKEMONTOWER_4
-	warp 18, 9, 0, POKEMONTOWER_6
+	warp 3, 9, 0, POKEMON_TOWER_4F
+	warp 18, 9, 0, POKEMON_TOWER_6F
 
 	db 0 ; signs
 
@@ -16,5 +16,5 @@ PokemonTower5Object:
 	object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET
 
 	; warp-to
-	warp_to 3, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_4
-	warp_to 18, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_6
+	warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F
+	warp_to 18, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_6F
diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/PokemonTower6F.asm
index 1dd66629..823fe78a 100755
--- a/data/mapObjects/pokemontower6.asm
+++ b/data/mapObjects/PokemonTower6F.asm
@@ -1,9 +1,9 @@
-PokemonTower6Object:
+PokemonTower6F_Object:
 	db $1 ; border block
 
 	db 2 ; warps
-	warp 18, 9, 1, POKEMONTOWER_5
-	warp 9, 16, 0, POKEMONTOWER_7
+	warp 18, 9, 1, POKEMON_TOWER_5F
+	warp 9, 16, 0, POKEMON_TOWER_7F
 
 	db 0 ; signs
 
@@ -15,5 +15,5 @@ PokemonTower6Object:
 	object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY
 
 	; warp-to
-	warp_to 18, 9, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_5
-	warp_to 9, 16, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7
+	warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F
+	warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F
diff --git a/data/mapObjects/pokemontower7.asm b/data/mapObjects/PokemonTower7F.asm
index 9609253f..79cb5b0d 100755
--- a/data/mapObjects/pokemontower7.asm
+++ b/data/mapObjects/PokemonTower7F.asm
@@ -1,8 +1,8 @@
-PokemonTower7Object:
+PokemonTower7F_Object:
 	db $1 ; border block
 
 	db 1 ; warps
-	warp 9, 16, 1, POKEMONTOWER_6
+	warp 9, 16, 1, POKEMON_TOWER_6F
 
 	db 0 ; signs
 
@@ -13,4 +13,4 @@ PokemonTower7Object:
 	object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person
 
 	; warp-to
-	warp_to 9, 16, POKEMONTOWER_7_WIDTH ; POKEMONTOWER_6
+	warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F
diff --git a/data/mapObjects/powerplant.asm b/data/mapObjects/PowerPlant.asm
index 402f899f..a8548b1c 100755
--- a/data/mapObjects/powerplant.asm
+++ b/data/mapObjects/PowerPlant.asm
@@ -1,4 +1,4 @@
-PowerPlantObject:
+PowerPlant_Object:
 	db $2e ; border block
 
 	db 3 ; warps
diff --git a/data/mapObjects/redshouse1f.asm b/data/mapObjects/RedsHouse1F.asm
index aabe6656..a54b5411 100755
--- a/data/mapObjects/redshouse1f.asm
+++ b/data/mapObjects/RedsHouse1F.asm
@@ -1,4 +1,4 @@
-RedsHouse1FObject:
+RedsHouse1F_Object:
 	db $a ; border block
 
 	db 3 ; warps
diff --git a/data/mapObjects/redshouse2f.asm b/data/mapObjects/RedsHouse2F.asm
index af3c4b6b..98e9c236 100755
--- a/data/mapObjects/redshouse2f.asm
+++ b/data/mapObjects/RedsHouse2F.asm
@@ -1,4 +1,4 @@
-RedsHouse2FObject:
+RedsHouse2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/RockTunnel1F.asm
index 1cfeca65..1cf5a12f 100755
--- a/data/mapObjects/rocktunnel1.asm
+++ b/data/mapObjects/RockTunnel1F.asm
@@ -1,4 +1,4 @@
-RockTunnel1Object:
+RockTunnel1F_Object:
 	db $3 ; border block
 
 	db 8 ; warps
@@ -6,10 +6,10 @@ RockTunnel1Object:
 	warp 15, 0, 1, -1
 	warp 15, 33, 2, -1
 	warp 15, 35, 2, -1
-	warp 37, 3, 0, ROCK_TUNNEL_2
-	warp 5, 3, 1, ROCK_TUNNEL_2
-	warp 17, 11, 2, ROCK_TUNNEL_2
-	warp 37, 17, 3, ROCK_TUNNEL_2
+	warp 37, 3, 0, ROCK_TUNNEL_B1F
+	warp 5, 3, 1, ROCK_TUNNEL_B1F
+	warp 17, 11, 2, ROCK_TUNNEL_B1F
+	warp 37, 17, 3, ROCK_TUNNEL_B1F
 
 	db 1 ; signs
 	sign 11, 29, 8 ; RockTunnel1Text8
@@ -24,11 +24,11 @@ RockTunnel1Object:
 	object SPRITE_LASS, 32, 24, STAY, RIGHT, 7, OPP_JR_TRAINER_F, 19
 
 	; warp-to
-	warp_to 15, 3, ROCK_TUNNEL_1_WIDTH
-	warp_to 15, 0, ROCK_TUNNEL_1_WIDTH
-	warp_to 15, 33, ROCK_TUNNEL_1_WIDTH
-	warp_to 15, 35, ROCK_TUNNEL_1_WIDTH
-	warp_to 37, 3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2
-	warp_to 5, 3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2
-	warp_to 17, 11, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2
-	warp_to 37, 17, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2
+	warp_to 15, 3, ROCK_TUNNEL_1F_WIDTH
+	warp_to 15, 0, ROCK_TUNNEL_1F_WIDTH
+	warp_to 15, 33, ROCK_TUNNEL_1F_WIDTH
+	warp_to 15, 35, ROCK_TUNNEL_1F_WIDTH
+	warp_to 37, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
+	warp_to 5, 3, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
+	warp_to 17, 11, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
+	warp_to 37, 17, ROCK_TUNNEL_1F_WIDTH ; ROCK_TUNNEL_B1F
diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/RockTunnelB1F.asm
index d60863c1..f562168e 100755
--- a/data/mapObjects/rocktunnel2.asm
+++ b/data/mapObjects/RockTunnelB1F.asm
@@ -1,11 +1,11 @@
-RockTunnel2Object:
+RockTunnelB1F_Object:
 	db $3 ; border block
 
 	db 4 ; warps
-	warp 33, 25, 4, ROCK_TUNNEL_1
-	warp 27, 3, 5, ROCK_TUNNEL_1
-	warp 23, 11, 6, ROCK_TUNNEL_1
-	warp 3, 3, 7, ROCK_TUNNEL_1
+	warp 33, 25, 4, ROCK_TUNNEL_1F
+	warp 27, 3, 5, ROCK_TUNNEL_1F
+	warp 23, 11, 6, ROCK_TUNNEL_1F
+	warp 3, 3, 7, ROCK_TUNNEL_1F
 
 	db 0 ; signs
 
@@ -20,7 +20,7 @@ RockTunnel2Object:
 	object SPRITE_BLACK_HAIR_BOY_2, 26, 30, STAY, DOWN, 8, OPP_POKEMANIAC, 5
 
 	; warp-to
-	warp_to 33, 25, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1
-	warp_to 27, 3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1
-	warp_to 23, 11, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1
-	warp_to 3, 3, ROCK_TUNNEL_2_WIDTH ; ROCK_TUNNEL_1
+	warp_to 33, 25, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
+	warp_to 27, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
+	warp_to 23, 11, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
+	warp_to 3, 3, ROCK_TUNNEL_B1F_WIDTH ; ROCK_TUNNEL_1F
diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/RockTunnelPokecenter.asm
index c664b206..a7619f7f 100755
--- a/data/mapObjects/rocktunnelpokecenter.asm
+++ b/data/mapObjects/RockTunnelPokecenter.asm
@@ -1,4 +1,4 @@
-RockTunnelPokecenterObject:
+RockTunnelPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/rockethideout1.asm b/data/mapObjects/RocketHideoutB1F.asm
index 3a51808d..99537510 100755
--- a/data/mapObjects/rockethideout1.asm
+++ b/data/mapObjects/RocketHideoutB1F.asm
@@ -1,11 +1,11 @@
-RocketHideout1Object:
+RocketHideoutB1F_Object:
 	db $2e ; border block
 
 	db 5 ; warps
-	warp 23, 2, 0, ROCKET_HIDEOUT_2
+	warp 23, 2, 0, ROCKET_HIDEOUT_B2F
 	warp 21, 2, 2, GAME_CORNER
 	warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR
-	warp 21, 24, 3, ROCKET_HIDEOUT_2
+	warp 21, 24, 3, ROCKET_HIDEOUT_B2F
 	warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
 
 	db 0 ; signs
@@ -20,8 +20,8 @@ RocketHideout1Object:
 	object SPRITE_BALL, 9, 17, STAY, NONE, 7, HYPER_POTION
 
 	; warp-to
-	warp_to 23, 2, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2
-	warp_to 21, 2, ROCKET_HIDEOUT_1_WIDTH ; GAME_CORNER
-	warp_to 24, 19, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
-	warp_to 21, 24, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_2
-	warp_to 25, 19, ROCKET_HIDEOUT_1_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to 23, 2, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F
+	warp_to 21, 2, ROCKET_HIDEOUT_B1F_WIDTH ; GAME_CORNER
+	warp_to 24, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to 21, 24, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_B2F
+	warp_to 25, 19, ROCKET_HIDEOUT_B1F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
diff --git a/data/mapObjects/RocketHideoutB2F.asm b/data/mapObjects/RocketHideoutB2F.asm
new file mode 100755
index 00000000..36fe9289
--- /dev/null
+++ b/data/mapObjects/RocketHideoutB2F.asm
@@ -0,0 +1,25 @@
+RocketHideoutB2F_Object:
+	db $2e ; border block
+
+	db 5 ; warps
+	warp 27, 8, 0, ROCKET_HIDEOUT_B1F
+	warp 21, 8, 0, ROCKET_HIDEOUT_B3F
+	warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR
+	warp 21, 22, 3, ROCKET_HIDEOUT_B1F
+	warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
+
+	db 0 ; signs
+
+	db 5 ; objects
+	object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13
+	object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE
+	object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET
+	object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07
+	object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION
+
+	; warp-to
+	warp_to 27, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F
+	warp_to 21, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B3F
+	warp_to 24, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to 21, 22, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F
+	warp_to 25, 19, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/RocketHideoutB3F.asm
index a8da69d2..6169dbed 100755
--- a/data/mapObjects/rockethideout3.asm
+++ b/data/mapObjects/RocketHideoutB3F.asm
@@ -1,9 +1,9 @@
-RocketHideout3Object:
+RocketHideoutB3F_Object:
 	db $2e ; border block
 
 	db 2 ; warps
-	warp 25, 6, 1, ROCKET_HIDEOUT_2
-	warp 19, 18, 0, ROCKET_HIDEOUT_4
+	warp 25, 6, 1, ROCKET_HIDEOUT_B2F
+	warp 19, 18, 0, ROCKET_HIDEOUT_B4F
 
 	db 0 ; signs
 
@@ -14,5 +14,5 @@ RocketHideout3Object:
 	object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY
 
 	; warp-to
-	warp_to 25, 6, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_2
-	warp_to 19, 18, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_4
+	warp_to 25, 6, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B2F
+	warp_to 19, 18, ROCKET_HIDEOUT_B3F_WIDTH ; ROCKET_HIDEOUT_B4F
diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/RocketHideoutB4F.asm
index 97025c71..be353f25 100755
--- a/data/mapObjects/rockethideout4.asm
+++ b/data/mapObjects/RocketHideoutB4F.asm
@@ -1,8 +1,8 @@
-RocketHideout4Object:
+RocketHideoutB4F_Object:
 	db $2e ; border block
 
 	db 3 ; warps
-	warp 19, 10, 1, ROCKET_HIDEOUT_3
+	warp 19, 10, 1, ROCKET_HIDEOUT_B3F
 	warp 24, 15, 0, ROCKET_HIDEOUT_ELEVATOR
 	warp 25, 15, 1, ROCKET_HIDEOUT_ELEVATOR
 
@@ -20,6 +20,6 @@ RocketHideout4Object:
 	object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY
 
 	; warp-to
-	warp_to 19, 10, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_3
-	warp_to 24, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
-	warp_to 25, 15, ROCKET_HIDEOUT_4_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to 19, 10, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_B3F
+	warp_to 24, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
+	warp_to 25, 15, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
diff --git a/data/mapObjects/RocketHideoutElevator.asm b/data/mapObjects/RocketHideoutElevator.asm
new file mode 100755
index 00000000..bc4fd7ff
--- /dev/null
+++ b/data/mapObjects/RocketHideoutElevator.asm
@@ -0,0 +1,15 @@
+RocketHideoutElevator_Object:
+	db $f ; border block
+
+	db 2 ; warps
+	warp 2, 1, 2, ROCKET_HIDEOUT_B1F
+	warp 3, 1, 4, ROCKET_HIDEOUT_B1F
+
+	db 1 ; signs
+	sign 1, 1, 1 ; RocketHideoutElevatorText1
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 2, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F
+	warp_to 3, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_B1F
diff --git a/data/mapObjects/route1.asm b/data/mapObjects/Route1.asm
index 26505ea6..0815fe67 100755
--- a/data/mapObjects/route1.asm
+++ b/data/mapObjects/Route1.asm
@@ -1,4 +1,4 @@
-Route1Object:
+Route1_Object:
 	db $b ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route10.asm b/data/mapObjects/Route10.asm
index 90abb47d..12850577 100755
--- a/data/mapObjects/route10.asm
+++ b/data/mapObjects/Route10.asm
@@ -1,10 +1,10 @@
-Route10Object:
+Route10_Object:
 	db $2c ; border block
 
 	db 4 ; warps
 	warp 11, 19, 0, ROCK_TUNNEL_POKECENTER
-	warp 8, 17, 0, ROCK_TUNNEL_1
-	warp 8, 53, 2, ROCK_TUNNEL_1
+	warp 8, 17, 0, ROCK_TUNNEL_1F
+	warp 8, 53, 2, ROCK_TUNNEL_1F
 	warp 6, 39, 0, POWER_PLANT
 
 	db 4 ; signs
@@ -23,6 +23,6 @@ Route10Object:
 
 	; warp-to
 	warp_to 11, 19, ROUTE_10_WIDTH ; ROCK_TUNNEL_POKECENTER
-	warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1
-	warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1
+	warp_to 8, 17, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F
+	warp_to 8, 53, ROUTE_10_WIDTH ; ROCK_TUNNEL_1F
 	warp_to 6, 39, ROUTE_10_WIDTH ; POWER_PLANT
diff --git a/data/mapObjects/route11.asm b/data/mapObjects/Route11.asm
index 8d8e35d6..5ed232f5 100755
--- a/data/mapObjects/route11.asm
+++ b/data/mapObjects/Route11.asm
@@ -1,4 +1,4 @@
-Route11Object:
+Route11_Object:
 	db $f ; border block
 
 	db 5 ; warps
@@ -6,7 +6,7 @@ Route11Object:
 	warp 49, 9, 1, ROUTE_11_GATE_1F
 	warp 58, 8, 2, ROUTE_11_GATE_1F
 	warp 58, 9, 3, ROUTE_11_GATE_1F
-	warp 4, 5, 0, DIGLETTS_CAVE_ENTRANCE
+	warp 4, 5, 0, DIGLETTS_CAVE_ROUTE_11
 
 	db 1 ; signs
 	sign 1, 5, 11 ; Route11Text11
@@ -28,4 +28,4 @@ Route11Object:
 	warp_to 49, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F
 	warp_to 58, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F
 	warp_to 58, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F
-	warp_to 4, 5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ENTRANCE
+	warp_to 4, 5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ROUTE_11
diff --git a/data/mapObjects/route11gate.asm b/data/mapObjects/Route11Gate1F.asm
index fa627963..5c4a120c 100755
--- a/data/mapObjects/route11gate.asm
+++ b/data/mapObjects/Route11Gate1F.asm
@@ -1,4 +1,4 @@
-Route11GateObject:
+Route11Gate1F_Object:
 	db $a ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/route11gateupstairs.asm b/data/mapObjects/Route11Gate2F.asm
index e112c685..bf305bba 100755
--- a/data/mapObjects/route11gateupstairs.asm
+++ b/data/mapObjects/Route11Gate2F.asm
@@ -1,4 +1,4 @@
-Route11GateUpstairsObject:
+Route11Gate2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route12.asm b/data/mapObjects/Route12.asm
index b72317d4..a9d84cf0 100755
--- a/data/mapObjects/route12.asm
+++ b/data/mapObjects/Route12.asm
@@ -1,11 +1,11 @@
-Route12Object:
+Route12_Object:
 	db $43 ; border block
 
 	db 4 ; warps
 	warp 10, 15, 0, ROUTE_12_GATE_1F
 	warp 11, 15, 1, ROUTE_12_GATE_1F
 	warp 10, 21, 2, ROUTE_12_GATE_1F
-	warp 11, 77, 0, ROUTE_12_HOUSE
+	warp 11, 77, 0, ROUTE_12_SUPER_ROD_HOUSE
 
 	db 2 ; signs
 	sign 13, 13, 11 ; Route12Text11
@@ -27,4 +27,4 @@ Route12Object:
 	warp_to 10, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F
 	warp_to 11, 15, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F
 	warp_to 10, 21, ROUTE_12_WIDTH ; ROUTE_12_GATE_1F
-	warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_HOUSE
+	warp_to 11, 77, ROUTE_12_WIDTH ; ROUTE_12_SUPER_ROD_HOUSE
diff --git a/data/mapObjects/route12gate.asm b/data/mapObjects/Route12Gate1F.asm
index bbfab54c..94f6b91a 100755
--- a/data/mapObjects/route12gate.asm
+++ b/data/mapObjects/Route12Gate1F.asm
@@ -1,4 +1,4 @@
-Route12GateObject:
+Route12Gate1F_Object:
 	db $a ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/Route12Gate2F.asm
index 9351ebac..cc6c1c19 100755
--- a/data/mapObjects/route12gateupstairs.asm
+++ b/data/mapObjects/Route12Gate2F.asm
@@ -1,4 +1,4 @@
-Route12GateUpstairsObject:
+Route12Gate2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route12house.asm b/data/mapObjects/Route12SuperRodHouse.asm
index 3161ebe6..458378a2 100755
--- a/data/mapObjects/route12house.asm
+++ b/data/mapObjects/Route12SuperRodHouse.asm
@@ -1,4 +1,4 @@
-Route12HouseObject:
+Route12SuperRodHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -11,5 +11,5 @@ Route12HouseObject:
 	object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, ROUTE_12_HOUSE_WIDTH
-	warp_to 3, 7, ROUTE_12_HOUSE_WIDTH
+	warp_to 2, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH
+	warp_to 3, 7, ROUTE_12_SUPER_ROD_HOUSE_WIDTH
diff --git a/data/mapObjects/route13.asm b/data/mapObjects/Route13.asm
index b2a40c2c..3f460901 100755
--- a/data/mapObjects/route13.asm
+++ b/data/mapObjects/Route13.asm
@@ -1,4 +1,4 @@
-Route13Object:
+Route13_Object:
 	db $43 ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route14.asm b/data/mapObjects/Route14.asm
index 9694715b..565e587f 100755
--- a/data/mapObjects/route14.asm
+++ b/data/mapObjects/Route14.asm
@@ -1,4 +1,4 @@
-Route14Object:
+Route14_Object:
 	db $43 ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route15.asm b/data/mapObjects/Route15.asm
index 21fd2d97..f52cc1b8 100755
--- a/data/mapObjects/route15.asm
+++ b/data/mapObjects/Route15.asm
@@ -1,4 +1,4 @@
-Route15Object:
+Route15_Object:
 	db $43 ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route15gate.asm b/data/mapObjects/Route15Gate1F.asm
index 13c39674..23b1f5a7 100755
--- a/data/mapObjects/route15gate.asm
+++ b/data/mapObjects/Route15Gate1F.asm
@@ -1,4 +1,4 @@
-Route15GateObject:
+Route15Gate1F_Object:
 	db $a ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/route15gateupstairs.asm b/data/mapObjects/Route15Gate2F.asm
index ff180883..162f2b1f 100755
--- a/data/mapObjects/route15gateupstairs.asm
+++ b/data/mapObjects/Route15Gate2F.asm
@@ -1,4 +1,4 @@
-Route15GateUpstairsObject:
+Route15Gate2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route16.asm b/data/mapObjects/Route16.asm
index 35ffea17..fb23e6ca 100755
--- a/data/mapObjects/route16.asm
+++ b/data/mapObjects/Route16.asm
@@ -1,4 +1,4 @@
-Route16Object:
+Route16_Object:
 	db $f ; border block
 
 	db 9 ; warps
@@ -10,7 +10,7 @@ Route16Object:
 	warp 17, 5, 5, ROUTE_16_GATE_1F
 	warp 24, 4, 6, ROUTE_16_GATE_1F
 	warp 24, 5, 7, ROUTE_16_GATE_1F
-	warp 7, 5, 0, ROUTE_16_HOUSE
+	warp 7, 5, 0, ROUTE_16_FLY_HOUSE
 
 	db 2 ; signs
 	sign 27, 11, 8 ; Route16Text8
@@ -34,4 +34,4 @@ Route16Object:
 	warp_to 17, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
 	warp_to 24, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
 	warp_to 24, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
-	warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_HOUSE
+	warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_FLY_HOUSE
diff --git a/data/mapObjects/route16house.asm b/data/mapObjects/Route16FlyHouse.asm
index 7a097105..ec493fef 100755
--- a/data/mapObjects/route16house.asm
+++ b/data/mapObjects/Route16FlyHouse.asm
@@ -1,4 +1,4 @@
-Route16HouseObject:
+Route16FlyHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -12,5 +12,5 @@ Route16HouseObject:
 	object SPRITE_BIRD, 6, 4, WALK, 0, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, ROUTE_16_HOUSE_WIDTH
-	warp_to 3, 7, ROUTE_16_HOUSE_WIDTH
+	warp_to 2, 7, ROUTE_16_FLY_HOUSE_WIDTH
+	warp_to 3, 7, ROUTE_16_FLY_HOUSE_WIDTH
diff --git a/data/mapObjects/route16gate.asm b/data/mapObjects/Route16Gate1F.asm
index 4e1863ed..1d5baa1d 100755
--- a/data/mapObjects/route16gate.asm
+++ b/data/mapObjects/Route16Gate1F.asm
@@ -1,4 +1,4 @@
-Route16GateObject:
+Route16Gate1F_Object:
 	db $a ; border block
 
 	db 9 ; warps
diff --git a/data/mapObjects/route16gateupstairs.asm b/data/mapObjects/Route16Gate2F.asm
index 41487e6e..5914f854 100755
--- a/data/mapObjects/route16gateupstairs.asm
+++ b/data/mapObjects/Route16Gate2F.asm
@@ -1,4 +1,4 @@
-Route16GateUpstairsObject:
+Route16Gate2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route17.asm b/data/mapObjects/Route17.asm
index 48750597..f5bc4307 100755
--- a/data/mapObjects/route17.asm
+++ b/data/mapObjects/Route17.asm
@@ -1,4 +1,4 @@
-Route17Object:
+Route17_Object:
 	db $43 ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route18.asm b/data/mapObjects/Route18.asm
index d7851f88..8bacd6c0 100755
--- a/data/mapObjects/route18.asm
+++ b/data/mapObjects/Route18.asm
@@ -1,4 +1,4 @@
-Route18Object:
+Route18_Object:
 	db $43 ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route18gate.asm b/data/mapObjects/Route18Gate1F.asm
index c73d7131..83cb386a 100755
--- a/data/mapObjects/route18gate.asm
+++ b/data/mapObjects/Route18Gate1F.asm
@@ -1,4 +1,4 @@
-Route18GateObject:
+Route18Gate1F_Object:
 	db $a ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/route18gateupstairs.asm b/data/mapObjects/Route18Gate2F.asm
index 6d298055..e48ec3b8 100755
--- a/data/mapObjects/route18gateupstairs.asm
+++ b/data/mapObjects/Route18Gate2F.asm
@@ -1,4 +1,4 @@
-Route18GateUpstairsObject:
+Route18Gate2F_Object:
 	db $a ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route19.asm b/data/mapObjects/Route19.asm
index 935b3d4d..9b39618e 100755
--- a/data/mapObjects/route19.asm
+++ b/data/mapObjects/Route19.asm
@@ -1,4 +1,4 @@
-Route19Object:
+Route19_Object:
 	db $43 ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route2.asm b/data/mapObjects/Route2.asm
index b62f9fdb..b27ad199 100755
--- a/data/mapObjects/route2.asm
+++ b/data/mapObjects/Route2.asm
@@ -1,13 +1,13 @@
-Route2Object:
+Route2_Object:
 	db $f ; border block
 
 	db 6 ; warps
-	warp 12, 9, 0, DIGLETTS_CAVE_EXIT
-	warp 3, 11, 1, VIRIDIAN_FOREST_EXIT
-	warp 15, 19, 0, ROUTE_2_HOUSE
+	warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2
+	warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE
+	warp 15, 19, 0, ROUTE_2_TRADE_HOUSE
 	warp 16, 35, 1, ROUTE_2_GATE
 	warp 15, 39, 2, ROUTE_2_GATE
-	warp 3, 43, 2, VIRIDIAN_FOREST_ENTRANCE
+	warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE
 
 	db 2 ; signs
 	sign 5, 65, 3 ; Route2Text3
@@ -18,12 +18,12 @@ Route2Object:
 	object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP
 
 	; warp-to
-	warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_EXIT
-	warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_EXIT
-	warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_HOUSE
+	warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_ROUTE_2
+	warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE
+	warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_TRADE_HOUSE
 	warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE
 	warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE
-	warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_ENTRANCE
+	warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
 
 	; unused
 	warp_to 2, 7, 4
diff --git a/data/mapObjects/route20.asm b/data/mapObjects/Route20.asm
index 5f4d5647..7bceef97 100755
--- a/data/mapObjects/route20.asm
+++ b/data/mapObjects/Route20.asm
@@ -1,9 +1,9 @@
-Route20Object:
+Route20_Object:
 	db $43 ; border block
 
 	db 2 ; warps
-	warp 48, 5, 0, SEAFOAM_ISLANDS_1
-	warp 58, 9, 2, SEAFOAM_ISLANDS_1
+	warp 48, 5, 0, SEAFOAM_ISLANDS_1F
+	warp 58, 9, 2, SEAFOAM_ISLANDS_1F
 
 	db 2 ; signs
 	sign 51, 7, 11 ; Route20Text11
@@ -22,5 +22,5 @@ Route20Object:
 	object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8
 
 	; warp-to
-	warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1
-	warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1
+	warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F
+	warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1F
diff --git a/data/mapObjects/route21.asm b/data/mapObjects/Route21.asm
index bb2409ce..b7759b59 100755
--- a/data/mapObjects/route21.asm
+++ b/data/mapObjects/Route21.asm
@@ -1,4 +1,4 @@
-Route21Object:
+Route21_Object:
 	db $43 ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route22.asm b/data/mapObjects/Route22.asm
index e91eb792..56e759fd 100755
--- a/data/mapObjects/route22.asm
+++ b/data/mapObjects/Route22.asm
@@ -1,4 +1,4 @@
-Route22Object:
+Route22_Object:
 	db $2c ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/Route22Gate.asm
index aa9512c6..3f693c7f 100755
--- a/data/mapObjects/route22gate.asm
+++ b/data/mapObjects/Route22Gate.asm
@@ -1,4 +1,4 @@
-Route22GateObject:
+Route22Gate_Object:
 	db $a ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route23.asm b/data/mapObjects/Route23.asm
index 2fd3e3d7..b510c285 100755
--- a/data/mapObjects/route23.asm
+++ b/data/mapObjects/Route23.asm
@@ -1,11 +1,11 @@
-Route23Object:
+Route23_Object:
 	db $f ; border block
 
 	db 4 ; warps
 	warp 7, 139, 2, ROUTE_22_GATE
 	warp 8, 139, 3, ROUTE_22_GATE
-	warp 4, 31, 0, VICTORY_ROAD_1
-	warp 14, 31, 1, VICTORY_ROAD_2
+	warp 4, 31, 0, VICTORY_ROAD_1F
+	warp 14, 31, 1, VICTORY_ROAD_2F
 
 	db 1 ; signs
 	sign 3, 33, 8 ; Route23Text8
@@ -22,5 +22,5 @@ Route23Object:
 	; warp-to
 	warp_to 7, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE
 	warp_to 8, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE
-	warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1
-	warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2
+	warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1F
+	warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2F
diff --git a/data/mapObjects/route24.asm b/data/mapObjects/Route24.asm
index 0fcc1d7b..8ef0d2b9 100755
--- a/data/mapObjects/route24.asm
+++ b/data/mapObjects/Route24.asm
@@ -1,4 +1,4 @@
-Route24Object:
+Route24_Object:
 	db $2c ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route25.asm b/data/mapObjects/Route25.asm
index 3ba5fbdb..a85f85ca 100755
--- a/data/mapObjects/route25.asm
+++ b/data/mapObjects/Route25.asm
@@ -1,4 +1,4 @@
-Route25Object:
+Route25_Object:
 	db $2c ; border block
 
 	db 1 ; warps
diff --git a/data/mapObjects/route2gate.asm b/data/mapObjects/Route2Gate.asm
index 714b8ee6..a7feb780 100755
--- a/data/mapObjects/route2gate.asm
+++ b/data/mapObjects/Route2Gate.asm
@@ -1,4 +1,4 @@
-Route2GateObject:
+Route2Gate_Object:
 	db $a ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/Route2TradeHouse.asm
index b27b65ef..89ece3ea 100755
--- a/data/mapObjects/route2house.asm
+++ b/data/mapObjects/Route2TradeHouse.asm
@@ -1,4 +1,4 @@
-Route2HouseObject:
+Route2TradeHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -12,5 +12,5 @@ Route2HouseObject:
 	object SPRITE_GAMEBOY_KID_COPY, 4, 1, STAY, DOWN, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, ROUTE_2_HOUSE_WIDTH
-	warp_to 3, 7, ROUTE_2_HOUSE_WIDTH
+	warp_to 2, 7, ROUTE_2_TRADE_HOUSE_WIDTH
+	warp_to 3, 7, ROUTE_2_TRADE_HOUSE_WIDTH
diff --git a/data/mapObjects/route3.asm b/data/mapObjects/Route3.asm
index 422fa29b..372ea6cf 100755
--- a/data/mapObjects/route3.asm
+++ b/data/mapObjects/Route3.asm
@@ -1,4 +1,4 @@
-Route3Object:
+Route3_Object:
 	db $2c ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/route4.asm b/data/mapObjects/Route4.asm
index 7d09c28a..4ab88f8f 100755
--- a/data/mapObjects/route4.asm
+++ b/data/mapObjects/Route4.asm
@@ -1,10 +1,10 @@
-Route4Object:
+Route4_Object:
 	db $2c ; border block
 
 	db 3 ; warps
 	warp 11, 5, 0, MT_MOON_POKECENTER
-	warp 18, 5, 0, MT_MOON_1
-	warp 24, 5, 7, MT_MOON_2
+	warp 18, 5, 0, MT_MOON_1F
+	warp 24, 5, 7, MT_MOON_B1F
 
 	db 3 ; signs
 	sign 12, 5, 4 ; PokeCenterSignText
@@ -18,5 +18,5 @@ Route4Object:
 
 	; warp-to
 	warp_to 11, 5, ROUTE_4_WIDTH ; MT_MOON_POKECENTER
-	warp_to 18, 5, ROUTE_4_WIDTH ; MT_MOON_1
-	warp_to 24, 5, ROUTE_4_WIDTH ; MT_MOON_2
+	warp_to 18, 5, ROUTE_4_WIDTH ; MT_MOON_1F
+	warp_to 24, 5, ROUTE_4_WIDTH ; MT_MOON_B1F
diff --git a/data/mapObjects/route5.asm b/data/mapObjects/Route5.asm
index 62aa6431..df2c8c03 100755
--- a/data/mapObjects/route5.asm
+++ b/data/mapObjects/Route5.asm
@@ -1,12 +1,12 @@
-Route5Object:
+Route5_Object:
 	db $a ; border block
 
 	db 5 ; warps
 	warp 10, 29, 3, ROUTE_5_GATE
 	warp 9, 29, 2, ROUTE_5_GATE
 	warp 10, 33, 0, ROUTE_5_GATE
-	warp 17, 27, 0, PATH_ENTRANCE_ROUTE_5
-	warp 10, 21, 0, DAYCAREM
+	warp 17, 27, 0, UNDERGROUND_PATH_ROUTE_5
+	warp 10, 21, 0, DAYCARE
 
 	db 1 ; signs
 	sign 17, 29, 1 ; Route5Text1
@@ -17,5 +17,5 @@ Route5Object:
 	warp_to 10, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE
 	warp_to 9, 29, ROUTE_5_WIDTH ; ROUTE_5_GATE
 	warp_to 10, 33, ROUTE_5_WIDTH ; ROUTE_5_GATE
-	warp_to 17, 27, ROUTE_5_WIDTH ; PATH_ENTRANCE_ROUTE_5
-	warp_to 10, 21, ROUTE_5_WIDTH ; DAYCAREM
+	warp_to 17, 27, ROUTE_5_WIDTH ; UNDERGROUND_PATH_ROUTE_5
+	warp_to 10, 21, ROUTE_5_WIDTH ; DAYCARE
diff --git a/data/mapObjects/route5gate.asm b/data/mapObjects/Route5Gate.asm
index 8b230942..e0e06a1d 100755
--- a/data/mapObjects/route5gate.asm
+++ b/data/mapObjects/Route5Gate.asm
@@ -1,4 +1,4 @@
-Route5GateObject:
+Route5Gate_Object:
 	db $a ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route6.asm b/data/mapObjects/Route6.asm
index e0eea85b..fc2d7e24 100755
--- a/data/mapObjects/route6.asm
+++ b/data/mapObjects/Route6.asm
@@ -1,11 +1,11 @@
-Route6Object:
+Route6_Object:
 	db $f ; border block
 
 	db 4 ; warps
 	warp 9, 1, 2, ROUTE_6_GATE
 	warp 10, 1, 2, ROUTE_6_GATE
 	warp 10, 7, 0, ROUTE_6_GATE
-	warp 17, 13, 0, PATH_ENTRANCE_ROUTE_6
+	warp 17, 13, 0, UNDERGROUND_PATH_ROUTE_6
 
 	db 1 ; signs
 	sign 19, 15, 7 ; Route6Text7
@@ -22,4 +22,4 @@ Route6Object:
 	warp_to 9, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE
 	warp_to 10, 1, ROUTE_6_WIDTH ; ROUTE_6_GATE
 	warp_to 10, 7, ROUTE_6_WIDTH ; ROUTE_6_GATE
-	warp_to 17, 13, ROUTE_6_WIDTH ; PATH_ENTRANCE_ROUTE_6
+	warp_to 17, 13, ROUTE_6_WIDTH ; UNDERGROUND_PATH_ROUTE_6
diff --git a/data/mapObjects/route6gate.asm b/data/mapObjects/Route6Gate.asm
index e3b7b2b8..8ed96d04 100755
--- a/data/mapObjects/route6gate.asm
+++ b/data/mapObjects/Route6Gate.asm
@@ -1,4 +1,4 @@
-Route6GateObject:
+Route6Gate_Object:
 	db $a ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route7.asm b/data/mapObjects/Route7.asm
index d32e6019..182904ef 100755
--- a/data/mapObjects/route7.asm
+++ b/data/mapObjects/Route7.asm
@@ -1,4 +1,4 @@
-Route7Object:
+Route7_Object:
 	db $f ; border block
 
 	db 5 ; warps
@@ -6,7 +6,7 @@ Route7Object:
 	warp 18, 10, 3, ROUTE_7_GATE
 	warp 11, 9, 0, ROUTE_7_GATE
 	warp 11, 10, 1, ROUTE_7_GATE
-	warp 5, 13, 0, PATH_ENTRANCE_ROUTE_7
+	warp 5, 13, 0, UNDERGROUND_PATH_ROUTE_7
 
 	db 1 ; signs
 	sign 3, 13, 1 ; Route7Text1
@@ -18,4 +18,4 @@ Route7Object:
 	warp_to 18, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE
 	warp_to 11, 9, ROUTE_7_WIDTH ; ROUTE_7_GATE
 	warp_to 11, 10, ROUTE_7_WIDTH ; ROUTE_7_GATE
-	warp_to 5, 13, ROUTE_7_WIDTH ; PATH_ENTRANCE_ROUTE_7
+	warp_to 5, 13, ROUTE_7_WIDTH ; UNDERGROUND_PATH_ROUTE_7
diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/Route7Gate.asm
index 0b726fd3..7f1afe0a 100755
--- a/data/mapObjects/route7gate.asm
+++ b/data/mapObjects/Route7Gate.asm
@@ -1,4 +1,4 @@
-Route7GateObject:
+Route7Gate_Object:
 	db $a ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route8.asm b/data/mapObjects/Route8.asm
index dc7580fc..137d70a0 100755
--- a/data/mapObjects/route8.asm
+++ b/data/mapObjects/Route8.asm
@@ -1,4 +1,4 @@
-Route8Object:
+Route8_Object:
 	db $2c ; border block
 
 	db 5 ; warps
@@ -6,7 +6,7 @@ Route8Object:
 	warp 1, 10, 1, ROUTE_8_GATE
 	warp 8, 9, 2, ROUTE_8_GATE
 	warp 8, 10, 3, ROUTE_8_GATE
-	warp 13, 3, 0, PATH_ENTRANCE_ROUTE_8
+	warp 13, 3, 0, UNDERGROUND_PATH_ROUTE_8
 
 	db 1 ; signs
 	sign 17, 3, 10 ; Route8Text10
@@ -27,4 +27,4 @@ Route8Object:
 	warp_to 1, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE
 	warp_to 8, 9, ROUTE_8_WIDTH ; ROUTE_8_GATE
 	warp_to 8, 10, ROUTE_8_WIDTH ; ROUTE_8_GATE
-	warp_to 13, 3, ROUTE_8_WIDTH ; PATH_ENTRANCE_ROUTE_8
+	warp_to 13, 3, ROUTE_8_WIDTH ; UNDERGROUND_PATH_ROUTE_8
diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/Route8Gate.asm
index ac286aa0..3bba95a0 100755
--- a/data/mapObjects/route8gate.asm
+++ b/data/mapObjects/Route8Gate.asm
@@ -1,4 +1,4 @@
-Route8GateObject:
+Route8Gate_Object:
 	db $a ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/route9.asm b/data/mapObjects/Route9.asm
index ab3ceefe..a991c0c7 100755
--- a/data/mapObjects/route9.asm
+++ b/data/mapObjects/Route9.asm
@@ -1,4 +1,4 @@
-Route9Object:
+Route9_Object:
 	db $2c ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/SSAnne1F.asm b/data/mapObjects/SSAnne1F.asm
new file mode 100755
index 00000000..3e454f06
--- /dev/null
+++ b/data/mapObjects/SSAnne1F.asm
@@ -0,0 +1,34 @@
+SSAnne1F_Object:
+	db $c ; border block
+
+	db 11 ; warps
+	warp 26, 0, 1, VERMILION_DOCK
+	warp 27, 0, 1, VERMILION_DOCK
+	warp 31, 8, 0, SS_ANNE_1F_ROOMS
+	warp 23, 8, 1, SS_ANNE_1F_ROOMS
+	warp 19, 8, 2, SS_ANNE_1F_ROOMS
+	warp 15, 8, 3, SS_ANNE_1F_ROOMS
+	warp 11, 8, 4, SS_ANNE_1F_ROOMS
+	warp 7, 8, 5, SS_ANNE_1F_ROOMS
+	warp 2, 6, 6, SS_ANNE_2F
+	warp 37, 15, 5, SS_ANNE_B1F
+	warp 3, 16, 0, SS_ANNE_KITCHEN
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person
+	object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person
+
+	; warp-to
+	warp_to 26, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK
+	warp_to 27, 0, SS_ANNE_1F_WIDTH ; VERMILION_DOCK
+	warp_to 31, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+	warp_to 23, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+	warp_to 19, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+	warp_to 15, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+	warp_to 11, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+	warp_to 7, 8, SS_ANNE_1F_WIDTH ; SS_ANNE_1F_ROOMS
+	warp_to 2, 6, SS_ANNE_1F_WIDTH ; SS_ANNE_2F
+	warp_to 37, 15, SS_ANNE_1F_WIDTH ; SS_ANNE_B1F
+	warp_to 3, 16, SS_ANNE_1F_WIDTH ; SS_ANNE_KITCHEN
diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/SSAnne1FRooms.asm
index d26921bd..617d2a55 100755
--- a/data/mapObjects/ssanne8.asm
+++ b/data/mapObjects/SSAnne1FRooms.asm
@@ -1,13 +1,13 @@
-SSAnne8Object:
+SSAnne1FRooms_Object:
 	db $c ; border block
 
 	db 6 ; warps
-	warp 0, 0, 2, SS_ANNE_1
-	warp 10, 0, 3, SS_ANNE_1
-	warp 20, 0, 4, SS_ANNE_1
-	warp 0, 10, 5, SS_ANNE_1
-	warp 10, 10, 6, SS_ANNE_1
-	warp 20, 10, 7, SS_ANNE_1
+	warp 0, 0, 2, SS_ANNE_1F
+	warp 10, 0, 3, SS_ANNE_1F
+	warp 20, 0, 4, SS_ANNE_1F
+	warp 0, 10, 5, SS_ANNE_1F
+	warp 10, 10, 6, SS_ANNE_1F
+	warp 20, 10, 7, SS_ANNE_1F
 
 	db 0 ; signs
 
@@ -25,9 +25,9 @@ SSAnne8Object:
 	object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person
 
 	; warp-to
-	warp_to 0, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1
-	warp_to 10, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1
-	warp_to 20, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1
-	warp_to 0, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1
-	warp_to 10, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1
-	warp_to 20, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1
+	warp_to 0, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+	warp_to 10, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+	warp_to 20, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+	warp_to 0, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+	warp_to 10, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
+	warp_to 20, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F
diff --git a/data/mapObjects/SSAnne2F.asm b/data/mapObjects/SSAnne2F.asm
new file mode 100755
index 00000000..6abd5ac4
--- /dev/null
+++ b/data/mapObjects/SSAnne2F.asm
@@ -0,0 +1,30 @@
+SSAnne2F_Object:
+	db $c ; border block
+
+	db 9 ; warps
+	warp 9, 11, 0, SS_ANNE_2F_ROOMS
+	warp 13, 11, 2, SS_ANNE_2F_ROOMS
+	warp 17, 11, 4, SS_ANNE_2F_ROOMS
+	warp 21, 11, 6, SS_ANNE_2F_ROOMS
+	warp 25, 11, 8, SS_ANNE_2F_ROOMS
+	warp 29, 11, 10, SS_ANNE_2F_ROOMS
+	warp 2, 4, 8, SS_ANNE_1F
+	warp 2, 12, 1, SS_ANNE_3F
+	warp 36, 4, 0, SS_ANNE_CAPTAINS_ROOM
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person
+	object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1
+
+	; warp-to
+	warp_to 9, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+	warp_to 13, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+	warp_to 17, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+	warp_to 21, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+	warp_to 25, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+	warp_to 29, 11, SS_ANNE_2F_WIDTH ; SS_ANNE_2F_ROOMS
+	warp_to 2, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_1F
+	warp_to 2, 12, SS_ANNE_2F_WIDTH ; SS_ANNE_3F
+	warp_to 36, 4, SS_ANNE_2F_WIDTH ; SS_ANNE_CAPTAINS_ROOM
diff --git a/data/mapObjects/SSAnne2FRooms.asm b/data/mapObjects/SSAnne2FRooms.asm
new file mode 100755
index 00000000..ebb053a8
--- /dev/null
+++ b/data/mapObjects/SSAnne2FRooms.asm
@@ -0,0 +1,47 @@
+SSAnne2FRooms_Object:
+	db $c ; border block
+
+	db 12 ; warps
+	warp 2, 5, 0, SS_ANNE_2F
+	warp 3, 5, 0, SS_ANNE_2F
+	warp 12, 5, 1, SS_ANNE_2F
+	warp 13, 5, 1, SS_ANNE_2F
+	warp 22, 5, 2, SS_ANNE_2F
+	warp 23, 5, 2, SS_ANNE_2F
+	warp 2, 15, 3, SS_ANNE_2F
+	warp 3, 15, 3, SS_ANNE_2F
+	warp 12, 15, 4, SS_ANNE_2F
+	warp 13, 15, 4, SS_ANNE_2F
+	warp 22, 15, 5, SS_ANNE_2F
+	warp 23, 15, 5, SS_ANNE_2F
+
+	db 0 ; signs
+
+	db 13 ; objects
+	object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3
+	object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1
+	object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5
+	object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12
+	object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person
+	object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER
+	object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person
+	object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person
+	object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY
+	object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person
+	object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person
+	object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person
+	object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person
+
+	; warp-to
+	warp_to 2, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 3, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 12, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 13, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 22, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 23, 5, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 2, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 3, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 12, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 13, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 22, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
+	warp_to 23, 15, SS_ANNE_2F_ROOMS_WIDTH ; SS_ANNE_2F
diff --git a/data/mapObjects/SSAnne3F.asm b/data/mapObjects/SSAnne3F.asm
new file mode 100755
index 00000000..f0bfc17b
--- /dev/null
+++ b/data/mapObjects/SSAnne3F.asm
@@ -0,0 +1,15 @@
+SSAnne3F_Object:
+	db $c ; border block
+
+	db 2 ; warps
+	warp 0, 3, 0, SS_ANNE_BOW
+	warp 19, 3, 7, SS_ANNE_2F
+
+	db 0 ; signs
+
+	db 1 ; objects
+	object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person
+
+	; warp-to
+	warp_to 0, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_BOW
+	warp_to 19, 3, SS_ANNE_3F_WIDTH ; SS_ANNE_2F
diff --git a/data/mapObjects/SSAnneB1F.asm b/data/mapObjects/SSAnneB1F.asm
new file mode 100755
index 00000000..fe54ea24
--- /dev/null
+++ b/data/mapObjects/SSAnneB1F.asm
@@ -0,0 +1,22 @@
+SSAnneB1F_Object:
+	db $c ; border block
+
+	db 6 ; warps
+	warp 23, 3, 8, SS_ANNE_B1F_ROOMS
+	warp 19, 3, 6, SS_ANNE_B1F_ROOMS
+	warp 15, 3, 4, SS_ANNE_B1F_ROOMS
+	warp 11, 3, 2, SS_ANNE_B1F_ROOMS
+	warp 7, 3, 0, SS_ANNE_B1F_ROOMS
+	warp 27, 5, 9, SS_ANNE_1F
+
+	db 0 ; signs
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 23, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+	warp_to 19, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+	warp_to 15, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+	warp_to 11, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+	warp_to 7, 3, SS_ANNE_B1F_WIDTH ; SS_ANNE_B1F_ROOMS
+	warp_to 27, 5, SS_ANNE_B1F_WIDTH ; SS_ANNE_1F
diff --git a/data/mapObjects/SSAnneB1FRooms.asm b/data/mapObjects/SSAnneB1FRooms.asm
new file mode 100755
index 00000000..1d31b89c
--- /dev/null
+++ b/data/mapObjects/SSAnneB1FRooms.asm
@@ -0,0 +1,41 @@
+SSAnneB1FRooms_Object:
+	db $c ; border block
+
+	db 10 ; warps
+	warp 2, 5, 4, SS_ANNE_B1F
+	warp 3, 5, 4, SS_ANNE_B1F
+	warp 12, 5, 3, SS_ANNE_B1F
+	warp 13, 5, 3, SS_ANNE_B1F
+	warp 22, 5, 2, SS_ANNE_B1F
+	warp 23, 5, 2, SS_ANNE_B1F
+	warp 2, 15, 1, SS_ANNE_B1F
+	warp 3, 15, 1, SS_ANNE_B1F
+	warp 12, 15, 0, SS_ANNE_B1F
+	warp 13, 15, 0, SS_ANNE_B1F
+
+	db 0 ; signs
+
+	db 11 ; objects
+	object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3
+	object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4
+	object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5
+	object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6
+	object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7
+	object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2
+	object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person
+	object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person
+	object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER
+	object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44
+	object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION
+
+	; warp-to
+	warp_to 2, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 3, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 12, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 13, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 22, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 23, 5, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 2, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 3, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 12, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
+	warp_to 13, 15, SS_ANNE_B1F_ROOMS_WIDTH ; SS_ANNE_B1F
diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/SSAnneBow.asm
index 106557be..8873c8f8 100755
--- a/data/mapObjects/ssanne5.asm
+++ b/data/mapObjects/SSAnneBow.asm
@@ -1,9 +1,9 @@
-SSAnne5Object:
+SSAnneBow_Object:
 	db $23 ; border block
 
 	db 2 ; warps
-	warp 13, 6, 0, SS_ANNE_3
-	warp 13, 7, 0, SS_ANNE_3
+	warp 13, 6, 0, SS_ANNE_3F
+	warp 13, 7, 0, SS_ANNE_3F
 
 	db 0 ; signs
 
@@ -15,5 +15,5 @@ SSAnne5Object:
 	object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2
 
 	; warp-to
-	warp_to 13, 6, SS_ANNE_5_WIDTH ; SS_ANNE_3
-	warp_to 13, 7, SS_ANNE_5_WIDTH ; SS_ANNE_3
+	warp_to 13, 6, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F
+	warp_to 13, 7, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F
diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/SSAnneCaptainsRoom.asm
index 7657170e..545656cc 100755
--- a/data/mapObjects/ssanne7.asm
+++ b/data/mapObjects/SSAnneCaptainsRoom.asm
@@ -1,8 +1,8 @@
-SSAnne7Object:
+SSAnneCaptainsRoom_Object:
 	db $c ; border block
 
 	db 1 ; warps
-	warp 0, 7, 8, SS_ANNE_2
+	warp 0, 7, 8, SS_ANNE_2F
 
 	db 2 ; signs
 	sign 4, 1, 2 ; SSAnne7Text2
@@ -12,4 +12,4 @@ SSAnne7Object:
 	object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person
 
 	; warp-to
-	warp_to 0, 7, SS_ANNE_7_WIDTH ; SS_ANNE_2
+	warp_to 0, 7, SS_ANNE_CAPTAINS_ROOM_WIDTH ; SS_ANNE_2F
diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/SSAnneKitchen.asm
index a25fe9b3..b5771e68 100755
--- a/data/mapObjects/ssanne6.asm
+++ b/data/mapObjects/SSAnneKitchen.asm
@@ -1,8 +1,8 @@
-SSAnne6Object:
+SSAnneKitchen_Object:
 	db $c ; border block
 
 	db 1 ; warps
-	warp 6, 0, 10, SS_ANNE_1
+	warp 6, 0, 10, SS_ANNE_1F
 
 	db 0 ; signs
 
@@ -16,4 +16,4 @@ SSAnne6Object:
 	object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person
 
 	; warp-to
-	warp_to 6, 0, SS_ANNE_6_WIDTH ; SS_ANNE_1
+	warp_to 6, 0, SS_ANNE_KITCHEN_WIDTH ; SS_ANNE_1F
diff --git a/data/mapObjects/safarizonecenter.asm b/data/mapObjects/SafariZoneCenter.asm
index 550f9aa4..e54cec74 100755
--- a/data/mapObjects/safarizonecenter.asm
+++ b/data/mapObjects/SafariZoneCenter.asm
@@ -1,16 +1,16 @@
-SafariZoneCenterObject:
+SafariZoneCenter_Object:
 	db $0 ; border block
 
 	db 9 ; warps
-	warp 14, 25, 2, SAFARI_ZONE_ENTRANCE
-	warp 15, 25, 3, SAFARI_ZONE_ENTRANCE
+	warp 14, 25, 2, SAFARI_ZONE_GATE
+	warp 15, 25, 3, SAFARI_ZONE_GATE
 	warp 0, 10, 4, SAFARI_ZONE_WEST
 	warp 0, 11, 5, SAFARI_ZONE_WEST
 	warp 14, 0, 4, SAFARI_ZONE_NORTH
 	warp 15, 0, 5, SAFARI_ZONE_NORTH
 	warp 29, 10, 2, SAFARI_ZONE_EAST
 	warp 29, 11, 3, SAFARI_ZONE_EAST
-	warp 17, 19, 0, SAFARI_ZONE_REST_HOUSE_1
+	warp 17, 19, 0, SAFARI_ZONE_CENTER_REST_HOUSE
 
 	db 2 ; signs
 	sign 18, 20, 2 ; SafariZoneCenterText2
@@ -20,12 +20,12 @@ SafariZoneCenterObject:
 	object SPRITE_BALL, 14, 10, STAY, NONE, 1, NUGGET
 
 	; warp-to
-	warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE
-	warp_to 15, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_ENTRANCE
+	warp_to 14, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE
+	warp_to 15, 25, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_GATE
 	warp_to 0, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST
 	warp_to 0, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_WEST
 	warp_to 14, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH
 	warp_to 15, 0, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_NORTH
 	warp_to 29, 10, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST
 	warp_to 29, 11, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_EAST
-	warp_to 17, 19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_REST_HOUSE_1
+	warp_to 17, 19, SAFARI_ZONE_CENTER_WIDTH ; SAFARI_ZONE_CENTER_REST_HOUSE
diff --git a/data/mapObjects/safarizoneresthouse1.asm b/data/mapObjects/SafariZoneCenterRestHouse.asm
index 031debec..9eda9970 100755
--- a/data/mapObjects/safarizoneresthouse1.asm
+++ b/data/mapObjects/SafariZoneCenterRestHouse.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse1Object:
+SafariZoneCenterRestHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -12,5 +12,5 @@ SafariZoneRestHouse1Object:
 	object SPRITE_OAK_AIDE, 1, 4, WALK, 1, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER
-	warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_1_WIDTH ; SAFARI_ZONE_CENTER
+	warp_to 2, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER
+	warp_to 3, 7, SAFARI_ZONE_CENTER_REST_HOUSE_WIDTH ; SAFARI_ZONE_CENTER
diff --git a/data/mapObjects/safarizoneeast.asm b/data/mapObjects/SafariZoneEast.asm
index 53553161..df612ea9 100755
--- a/data/mapObjects/safarizoneeast.asm
+++ b/data/mapObjects/SafariZoneEast.asm
@@ -1,4 +1,4 @@
-SafariZoneEastObject:
+SafariZoneEast_Object:
 	db $0 ; border block
 
 	db 5 ; warps
@@ -6,7 +6,7 @@ SafariZoneEastObject:
 	warp 0, 5, 7, SAFARI_ZONE_NORTH
 	warp 0, 22, 6, SAFARI_ZONE_CENTER
 	warp 0, 23, 6, SAFARI_ZONE_CENTER
-	warp 25, 9, 0, SAFARI_ZONE_REST_HOUSE_3
+	warp 25, 9, 0, SAFARI_ZONE_EAST_REST_HOUSE
 
 	db 3 ; signs
 	sign 26, 10, 5 ; SafariZoneEastText5
@@ -24,4 +24,4 @@ SafariZoneEastObject:
 	warp_to 0, 5, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH
 	warp_to 0, 22, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER
 	warp_to 0, 23, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_CENTER
-	warp_to 25, 9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_REST_HOUSE_3
+	warp_to 25, 9, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_EAST_REST_HOUSE
diff --git a/data/mapObjects/safarizoneresthouse3.asm b/data/mapObjects/SafariZoneEastRestHouse.asm
index 00623953..e7c68343 100755
--- a/data/mapObjects/safarizoneresthouse3.asm
+++ b/data/mapObjects/SafariZoneEastRestHouse.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse3Object:
+SafariZoneEastRestHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ SafariZoneRestHouse3Object:
 	object SPRITE_LAPRAS_GIVER, 5, 2, STAY, NONE, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST
-	warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_3_WIDTH ; SAFARI_ZONE_EAST
+	warp_to 2, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST
+	warp_to 3, 7, SAFARI_ZONE_EAST_REST_HOUSE_WIDTH ; SAFARI_ZONE_EAST
diff --git a/data/mapObjects/safarizoneentrance.asm b/data/mapObjects/SafariZoneGate.asm
index 5a3379c7..6749b45b 100755
--- a/data/mapObjects/safarizoneentrance.asm
+++ b/data/mapObjects/SafariZoneGate.asm
@@ -1,4 +1,4 @@
-SafariZoneEntranceObject:
+SafariZoneGate_Object:
 	db $a ; border block
 
 	db 4 ; warps
@@ -14,7 +14,7 @@ SafariZoneEntranceObject:
 	object SPRITE_WHITE_PLAYER, 1, 4, STAY, RIGHT, 2 ; person
 
 	; warp-to
-	warp_to 3, 5, SAFARI_ZONE_ENTRANCE_WIDTH
-	warp_to 4, 5, SAFARI_ZONE_ENTRANCE_WIDTH
-	warp_to 3, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER
-	warp_to 4, 0, SAFARI_ZONE_ENTRANCE_WIDTH ; SAFARI_ZONE_CENTER
+	warp_to 3, 5, SAFARI_ZONE_GATE_WIDTH
+	warp_to 4, 5, SAFARI_ZONE_GATE_WIDTH
+	warp_to 3, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER
+	warp_to 4, 0, SAFARI_ZONE_GATE_WIDTH ; SAFARI_ZONE_CENTER
diff --git a/data/mapObjects/safarizonenorth.asm b/data/mapObjects/SafariZoneNorth.asm
index 6cbe51f6..9eda7b4b 100755
--- a/data/mapObjects/safarizonenorth.asm
+++ b/data/mapObjects/SafariZoneNorth.asm
@@ -1,4 +1,4 @@
-SafariZoneNorthObject:
+SafariZoneNorth_Object:
 	db $0 ; border block
 
 	db 9 ; warps
@@ -10,7 +10,7 @@ SafariZoneNorthObject:
 	warp 21, 35, 5, SAFARI_ZONE_CENTER
 	warp 39, 30, 0, SAFARI_ZONE_EAST
 	warp 39, 31, 1, SAFARI_ZONE_EAST
-	warp 35, 3, 0, SAFARI_ZONE_REST_HOUSE_4
+	warp 35, 3, 0, SAFARI_ZONE_NORTH_REST_HOUSE
 
 	db 5 ; signs
 	sign 36, 4, 3 ; SafariZoneNorthText3
@@ -32,4 +32,4 @@ SafariZoneNorthObject:
 	warp_to 21, 35, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_CENTER
 	warp_to 39, 30, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST
 	warp_to 39, 31, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_EAST
-	warp_to 35, 3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_REST_HOUSE_4
+	warp_to 35, 3, SAFARI_ZONE_NORTH_WIDTH ; SAFARI_ZONE_NORTH_REST_HOUSE
diff --git a/data/mapObjects/safarizoneresthouse4.asm b/data/mapObjects/SafariZoneNorthRestHouse.asm
index d3b81b4e..34b3ab4f 100755
--- a/data/mapObjects/safarizoneresthouse4.asm
+++ b/data/mapObjects/SafariZoneNorthRestHouse.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse4Object:
+SafariZoneNorthRestHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ SafariZoneRestHouse4Object:
 	object SPRITE_GENTLEMAN, 1, 5, WALK, 1, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH
-	warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_4_WIDTH ; SAFARI_ZONE_NORTH
+	warp_to 2, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH
+	warp_to 3, 7, SAFARI_ZONE_NORTH_REST_HOUSE_WIDTH ; SAFARI_ZONE_NORTH
diff --git a/data/mapObjects/safarizonesecrethouse.asm b/data/mapObjects/SafariZoneSecretHouse.asm
index 4faa90c6..2a5fc22d 100755
--- a/data/mapObjects/safarizonesecrethouse.asm
+++ b/data/mapObjects/SafariZoneSecretHouse.asm
@@ -1,4 +1,4 @@
-SafariZoneSecretHouseObject:
+SafariZoneSecretHouse_Object:
 	db $17 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/SafariZoneWest.asm
index 5d3c6d19..7faced72 100755
--- a/data/mapObjects/safarizonewest.asm
+++ b/data/mapObjects/SafariZoneWest.asm
@@ -1,4 +1,4 @@
-SafariZoneWestObject:
+SafariZoneWest_Object:
 	db $0 ; border block
 
 	db 8 ; warps
@@ -9,7 +9,7 @@ SafariZoneWestObject:
 	warp 29, 22, 2, SAFARI_ZONE_CENTER
 	warp 29, 23, 3, SAFARI_ZONE_CENTER
 	warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE
-	warp 11, 11, 0, SAFARI_ZONE_REST_HOUSE_2
+	warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE
 
 	db 4 ; signs
 	sign 12, 12, 5 ; SafariZoneWestText5
@@ -31,4 +31,4 @@ SafariZoneWestObject:
 	warp_to 29, 22, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER
 	warp_to 29, 23, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER
 	warp_to 3, 3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE
-	warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_REST_HOUSE_2
+	warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_WEST_REST_HOUSE
diff --git a/data/mapObjects/safarizoneresthouse2.asm b/data/mapObjects/SafariZoneWestRestHouse.asm
index 7e589731..9f1bc0ed 100755
--- a/data/mapObjects/safarizoneresthouse2.asm
+++ b/data/mapObjects/SafariZoneWestRestHouse.asm
@@ -1,4 +1,4 @@
-SafariZoneRestHouse2Object:
+SafariZoneWestRestHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ SafariZoneRestHouse2Object:
 	object SPRITE_ERIKA, 6, 2, STAY, DOWN, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST
-	warp_to 3, 7, SAFARI_ZONE_REST_HOUSE_2_WIDTH ; SAFARI_ZONE_WEST
+	warp_to 2, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST
+	warp_to 3, 7, SAFARI_ZONE_WEST_REST_HOUSE_WIDTH ; SAFARI_ZONE_WEST
diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/SaffronCity.asm
index d9afc7ec..b8d3a9cf 100755
--- a/data/mapObjects/saffroncity.asm
+++ b/data/mapObjects/SaffronCity.asm
@@ -1,15 +1,15 @@
-SaffronCityObject:
+SaffronCity_Object:
 	db $f ; border block
 
 	db 8 ; warps
 	warp 7, 5, 0, COPYCATS_HOUSE_1F
 	warp 26, 3, 0, FIGHTING_DOJO
 	warp 34, 3, 0, SAFFRON_GYM
-	warp 13, 11, 0, SAFFRON_HOUSE_1
+	warp 13, 11, 0, SAFFRON_PIDGEY_HOUSE
 	warp 25, 11, 0, SAFFRON_MART
 	warp 18, 21, 0, SILPH_CO_1F
 	warp 9, 29, 0, SAFFRON_POKECENTER
-	warp 29, 29, 0, SAFFRON_HOUSE_2
+	warp 29, 29, 0, MR_PSYCHICS_HOUSE
 
 	db 10 ; signs
 	sign 17, 5, 16 ; SaffronCityText16
@@ -44,8 +44,8 @@ SaffronCityObject:
 	warp_to 7, 5, SAFFRON_CITY_WIDTH ; COPYCATS_HOUSE_1F
 	warp_to 26, 3, SAFFRON_CITY_WIDTH ; FIGHTING_DOJO
 	warp_to 34, 3, SAFFRON_CITY_WIDTH ; SAFFRON_GYM
-	warp_to 13, 11, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_1
+	warp_to 13, 11, SAFFRON_CITY_WIDTH ; SAFFRON_PIDGEY_HOUSE
 	warp_to 25, 11, SAFFRON_CITY_WIDTH ; SAFFRON_MART
 	warp_to 18, 21, SAFFRON_CITY_WIDTH ; SILPH_CO_1F
 	warp_to 9, 29, SAFFRON_CITY_WIDTH ; SAFFRON_POKECENTER
-	warp_to 29, 29, SAFFRON_CITY_WIDTH ; SAFFRON_HOUSE_2
+	warp_to 29, 29, SAFFRON_CITY_WIDTH ; MR_PSYCHICS_HOUSE
diff --git a/data/mapObjects/saffrongym.asm b/data/mapObjects/SaffronGym.asm
index b466d152..1869421a 100755
--- a/data/mapObjects/saffrongym.asm
+++ b/data/mapObjects/SaffronGym.asm
@@ -1,4 +1,4 @@
-SaffronGymObject:
+SaffronGym_Object:
 	db $2e ; border block
 
 	db 32 ; warps
diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/SaffronMart.asm
index 6293b901..c376f2de 100755
--- a/data/mapObjects/saffronmart.asm
+++ b/data/mapObjects/SaffronMart.asm
@@ -1,4 +1,4 @@
-SaffronMartObject:
+SaffronMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/saffronhouse1.asm b/data/mapObjects/SaffronPidgeyHouse.asm
index c6abb539..65a851bf 100755
--- a/data/mapObjects/saffronhouse1.asm
+++ b/data/mapObjects/SaffronPidgeyHouse.asm
@@ -1,4 +1,4 @@
-SaffronHouse1Object:
+SaffronPidgeyHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -14,5 +14,5 @@ SaffronHouse1Object:
 	object SPRITE_PAPER_SHEET, 3, 3, STAY, NONE, 4 ; person
 
 	; warp-to
-	warp_to 2, 7, SAFFRON_HOUSE_1_WIDTH
-	warp_to 3, 7, SAFFRON_HOUSE_1_WIDTH
+	warp_to 2, 7, SAFFRON_PIDGEY_HOUSE_WIDTH
+	warp_to 3, 7, SAFFRON_PIDGEY_HOUSE_WIDTH
diff --git a/data/mapObjects/saffronpokecenter.asm b/data/mapObjects/SaffronPokecenter.asm
index b367ec89..e54fd76b 100755
--- a/data/mapObjects/saffronpokecenter.asm
+++ b/data/mapObjects/SaffronPokecenter.asm
@@ -1,4 +1,4 @@
-SaffronPokecenterObject:
+SaffronPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/SeafoamIslands1F.asm b/data/mapObjects/SeafoamIslands1F.asm
new file mode 100755
index 00000000..8707ee0a
--- /dev/null
+++ b/data/mapObjects/SeafoamIslands1F.asm
@@ -0,0 +1,30 @@
+SeafoamIslands1F_Object:
+	db $7d ; border block
+
+	db 7 ; warps
+	warp 4, 17, 0, -1
+	warp 5, 17, 0, -1
+	warp 26, 17, 1, -1
+	warp 27, 17, 1, -1
+	warp 7, 5, 1, SEAFOAM_ISLANDS_B1F
+	warp 25, 3, 6, SEAFOAM_ISLANDS_B1F
+	warp 23, 15, 4, SEAFOAM_ISLANDS_B1F
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+	object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+
+	; warp-to
+	warp_to 4, 17, SEAFOAM_ISLANDS_1F_WIDTH
+	warp_to 5, 17, SEAFOAM_ISLANDS_1F_WIDTH
+	warp_to 26, 17, SEAFOAM_ISLANDS_1F_WIDTH
+	warp_to 27, 17, SEAFOAM_ISLANDS_1F_WIDTH
+	warp_to 7, 5, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
+	warp_to 25, 3, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
+	warp_to 23, 15, SEAFOAM_ISLANDS_1F_WIDTH ; SEAFOAM_ISLANDS_B1F
+
+	; holes
+	warp_to 17, 6, SEAFOAM_ISLANDS_1F_WIDTH
+	warp_to 24, 6, SEAFOAM_ISLANDS_1F_WIDTH
diff --git a/data/mapObjects/SeafoamIslandsB1F.asm b/data/mapObjects/SeafoamIslandsB1F.asm
new file mode 100755
index 00000000..426ca0c3
--- /dev/null
+++ b/data/mapObjects/SeafoamIslandsB1F.asm
@@ -0,0 +1,26 @@
+SeafoamIslandsB1F_Object:
+	db $7d ; border block
+
+	db 7 ; warps
+	warp 4, 2, 0, SEAFOAM_ISLANDS_B2F
+	warp 7, 5, 4, SEAFOAM_ISLANDS_1F
+	warp 13, 7, 2, SEAFOAM_ISLANDS_B2F
+	warp 19, 15, 3, SEAFOAM_ISLANDS_B2F
+	warp 23, 15, 6, SEAFOAM_ISLANDS_1F
+	warp 25, 11, 5, SEAFOAM_ISLANDS_B2F
+	warp 25, 3, 5, SEAFOAM_ISLANDS_1F
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+	object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+
+	; warp-to
+	warp_to 4, 2, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 7, 5, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
+	warp_to 13, 7, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 19, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 23, 15, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
+	warp_to 25, 11, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 25, 3, SEAFOAM_ISLANDS_B1F_WIDTH ; SEAFOAM_ISLANDS_1F
diff --git a/data/mapObjects/SeafoamIslandsB2F.asm b/data/mapObjects/SeafoamIslandsB2F.asm
new file mode 100755
index 00000000..9c1a7898
--- /dev/null
+++ b/data/mapObjects/SeafoamIslandsB2F.asm
@@ -0,0 +1,26 @@
+SeafoamIslandsB2F_Object:
+	db $7d ; border block
+
+	db 7 ; warps
+	warp 5, 3, 0, SEAFOAM_ISLANDS_B1F
+	warp 5, 13, 0, SEAFOAM_ISLANDS_B3F
+	warp 13, 7, 2, SEAFOAM_ISLANDS_B1F
+	warp 19, 15, 3, SEAFOAM_ISLANDS_B1F
+	warp 25, 3, 3, SEAFOAM_ISLANDS_B3F
+	warp 25, 11, 5, SEAFOAM_ISLANDS_B1F
+	warp 25, 14, 4, SEAFOAM_ISLANDS_B3F
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+	object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+
+	; warp-to
+	warp_to 5, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
+	warp_to 5, 13, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F
+	warp_to 13, 7, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
+	warp_to 19, 15, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
+	warp_to 25, 3, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F
+	warp_to 25, 11, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B1F
+	warp_to 25, 14, SEAFOAM_ISLANDS_B2F_WIDTH ; SEAFOAM_ISLANDS_B3F
diff --git a/data/mapObjects/SeafoamIslandsB3F.asm b/data/mapObjects/SeafoamIslandsB3F.asm
new file mode 100755
index 00000000..d194e1cd
--- /dev/null
+++ b/data/mapObjects/SeafoamIslandsB3F.asm
@@ -0,0 +1,30 @@
+SeafoamIslandsB3F_Object:
+	db $7d ; border block
+
+	db 7 ; warps
+	warp 5, 12, 1, SEAFOAM_ISLANDS_B2F
+	warp 8, 6, 2, SEAFOAM_ISLANDS_B4F
+	warp 25, 4, 3, SEAFOAM_ISLANDS_B4F
+	warp 25, 3, 4, SEAFOAM_ISLANDS_B2F
+	warp 25, 14, 6, SEAFOAM_ISLANDS_B2F
+	warp 20, 17, 0, SEAFOAM_ISLANDS_B4F
+	warp 21, 17, 1, SEAFOAM_ISLANDS_B4F
+
+	db 0 ; signs
+
+	db 6 ; objects
+	object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
+	object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
+	object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
+	object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
+	object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person
+	object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person
+
+	; warp-to
+	warp_to 5, 12, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 8, 6, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
+	warp_to 25, 4, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
+	warp_to 25, 3, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 25, 14, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B2F
+	warp_to 20, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
+	warp_to 21, 17, SEAFOAM_ISLANDS_B3F_WIDTH ; SEAFOAM_ISLANDS_B4F
diff --git a/data/mapObjects/SeafoamIslandsB4F.asm b/data/mapObjects/SeafoamIslandsB4F.asm
new file mode 100755
index 00000000..62d88b0c
--- /dev/null
+++ b/data/mapObjects/SeafoamIslandsB4F.asm
@@ -0,0 +1,23 @@
+SeafoamIslandsB4F_Object:
+	db $7d ; border block
+
+	db 4 ; warps
+	warp 20, 17, 5, SEAFOAM_ISLANDS_B3F
+	warp 21, 17, 6, SEAFOAM_ISLANDS_B3F
+	warp 11, 7, 1, SEAFOAM_ISLANDS_B3F
+	warp 25, 4, 2, SEAFOAM_ISLANDS_B3F
+
+	db 2 ; signs
+	sign 9, 15, 4 ; SeafoamIslands5Text4
+	sign 23, 1, 5 ; SeafoamIslands5Text5
+
+	db 3 ; objects
+	object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person
+	object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person
+	object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50
+
+	; warp-to
+	warp_to 20, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
+	warp_to 21, 17, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
+	warp_to 11, 7, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
+	warp_to 25, 4, SEAFOAM_ISLANDS_B4F_WIDTH ; SEAFOAM_ISLANDS_B3F
diff --git a/data/mapObjects/silphco10.asm b/data/mapObjects/SilphCo10F.asm
index 90fa2acd..1c8948d3 100755
--- a/data/mapObjects/silphco10.asm
+++ b/data/mapObjects/SilphCo10F.asm
@@ -1,4 +1,4 @@
-SilphCo10Object:
+SilphCo10F_Object:
 	db $2e ; border block
 
 	db 6 ; warps
diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/SilphCo11F.asm
index a130f4f1..7a1dff73 100755
--- a/data/mapObjects/silphco11.asm
+++ b/data/mapObjects/SilphCo11F.asm
@@ -1,4 +1,4 @@
-SilphCo11Object:
+SilphCo11F_Object:
 	db $d ; border block
 
 	db 4 ; warps
diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/SilphCo1F.asm
index 0f98247b..fc040091 100755
--- a/data/mapObjects/silphco1.asm
+++ b/data/mapObjects/SilphCo1F.asm
@@ -1,4 +1,4 @@
-SilphCo1Object:
+SilphCo1F_Object:
 	db $2e ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/silphco2.asm b/data/mapObjects/SilphCo2F.asm
index 4b7f34f6..bc30d78d 100755
--- a/data/mapObjects/silphco2.asm
+++ b/data/mapObjects/SilphCo2F.asm
@@ -1,4 +1,4 @@
-SilphCo2Object:
+SilphCo2F_Object:
 	db $2e ; border block
 
 	db 7 ; warps
diff --git a/data/mapObjects/silphco3.asm b/data/mapObjects/SilphCo3F.asm
index 86b3b215..f45cdf81 100755
--- a/data/mapObjects/silphco3.asm
+++ b/data/mapObjects/SilphCo3F.asm
@@ -1,4 +1,4 @@
-SilphCo3Object:
+SilphCo3F_Object:
 	db $2e ; border block
 
 	db 10 ; warps
diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/SilphCo4F.asm
index 73082342..3d865bbc 100755
--- a/data/mapObjects/silphco4.asm
+++ b/data/mapObjects/SilphCo4F.asm
@@ -1,4 +1,4 @@
-SilphCo4Object:
+SilphCo4F_Object:
 	db $2e ; border block
 
 	db 7 ; warps
diff --git a/data/mapObjects/silphco5.asm b/data/mapObjects/SilphCo5F.asm
index 5a7d59fc..c10f17c8 100755
--- a/data/mapObjects/silphco5.asm
+++ b/data/mapObjects/SilphCo5F.asm
@@ -1,4 +1,4 @@
-SilphCo5Object:
+SilphCo5F_Object:
 	db $2e ; border block
 
 	db 7 ; warps
diff --git a/data/mapObjects/silphco6.asm b/data/mapObjects/SilphCo6F.asm
index c936970d..ad2ac32f 100755
--- a/data/mapObjects/silphco6.asm
+++ b/data/mapObjects/SilphCo6F.asm
@@ -1,4 +1,4 @@
-SilphCo6Object:
+SilphCo6F_Object:
 	db $2e ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/silphco7.asm b/data/mapObjects/SilphCo7F.asm
index 96dc64a5..255f4b33 100755
--- a/data/mapObjects/silphco7.asm
+++ b/data/mapObjects/SilphCo7F.asm
@@ -1,4 +1,4 @@
-SilphCo7Object:
+SilphCo7F_Object:
 	db $2e ; border block
 
 	db 6 ; warps
diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/SilphCo8F.asm
index 513e84ea..d05c7844 100755
--- a/data/mapObjects/silphco8.asm
+++ b/data/mapObjects/SilphCo8F.asm
@@ -1,4 +1,4 @@
-SilphCo8Object:
+SilphCo8F_Object:
 	db $2e ; border block
 
 	db 7 ; warps
diff --git a/data/mapObjects/silphco9.asm b/data/mapObjects/SilphCo9F.asm
index 377d7ca0..28ef5f10 100755
--- a/data/mapObjects/silphco9.asm
+++ b/data/mapObjects/SilphCo9F.asm
@@ -1,4 +1,4 @@
-SilphCo9Object:
+SilphCo9F_Object:
 	db $2e ; border block
 
 	db 5 ; warps
diff --git a/data/mapObjects/silphcoelevator.asm b/data/mapObjects/SilphCoElevator.asm
index 205fc046..9c4b5a79 100755
--- a/data/mapObjects/silphcoelevator.asm
+++ b/data/mapObjects/SilphCoElevator.asm
@@ -1,4 +1,4 @@
-SilphCoElevatorObject:
+SilphCoElevator_Object:
 	db $f ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/tradecenter.asm b/data/mapObjects/TradeCenter.asm
index 63c3e04a..e6df8087 100755
--- a/data/mapObjects/tradecenter.asm
+++ b/data/mapObjects/TradeCenter.asm
@@ -1,4 +1,4 @@
-TradeCenterObject:
+TradeCenter_Object:
 	db $e ; border block
 
 	db 0 ; warps
diff --git a/data/mapObjects/UndergroundPathNorthSouth.asm b/data/mapObjects/UndergroundPathNorthSouth.asm
new file mode 100755
index 00000000..35e21cca
--- /dev/null
+++ b/data/mapObjects/UndergroundPathNorthSouth.asm
@@ -0,0 +1,14 @@
+UndergroundPathNorthSouth_Object:
+	db $1 ; border block
+
+	db 2 ; warps
+	warp 5, 4, 2, UNDERGROUND_PATH_ROUTE_5
+	warp 2, 41, 2, UNDERGROUND_PATH_ROUTE_6
+
+	db 0 ; signs
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 5, 4, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_5
+	warp_to 2, 41, UNDERGROUND_PATH_NORTH_SOUTH_WIDTH ; UNDERGROUND_PATH_ROUTE_6
diff --git a/data/mapObjects/UndergroundPathRoute5.asm b/data/mapObjects/UndergroundPathRoute5.asm
new file mode 100755
index 00000000..af71ebb4
--- /dev/null
+++ b/data/mapObjects/UndergroundPathRoute5.asm
@@ -0,0 +1,17 @@
+UndergroundPathRoute5_Object:
+	db $a ; border block
+
+	db 3 ; warps
+	warp 3, 7, 3, -1
+	warp 4, 7, 3, -1
+	warp 4, 4, 0, UNDERGROUND_PATH_NORTH_SOUTH
+
+	db 0 ; signs
+
+	db 1 ; objects
+	object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person
+
+	; warp-to
+	warp_to 3, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH
+	warp_to 4, 7, UNDERGROUND_PATH_ROUTE_5_WIDTH
+	warp_to 4, 4, UNDERGROUND_PATH_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH
diff --git a/data/mapObjects/UndergroundPathRoute6.asm b/data/mapObjects/UndergroundPathRoute6.asm
new file mode 100755
index 00000000..5a40ade2
--- /dev/null
+++ b/data/mapObjects/UndergroundPathRoute6.asm
@@ -0,0 +1,17 @@
+UndergroundPathRoute6_Object:
+	db $a ; border block
+
+	db 3 ; warps
+	warp 3, 7, 3, -1
+	warp 4, 7, 3, -1
+	warp 4, 4, 1, UNDERGROUND_PATH_NORTH_SOUTH
+
+	db 0 ; signs
+
+	db 1 ; objects
+	object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person
+
+	; warp-to
+	warp_to 3, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH
+	warp_to 4, 7, UNDERGROUND_PATH_ROUTE_6_WIDTH
+	warp_to 4, 4, UNDERGROUND_PATH_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NORTH_SOUTH
diff --git a/data/mapObjects/UndergroundPathRoute7.asm b/data/mapObjects/UndergroundPathRoute7.asm
new file mode 100755
index 00000000..4666e0c9
--- /dev/null
+++ b/data/mapObjects/UndergroundPathRoute7.asm
@@ -0,0 +1,17 @@
+UndergroundPathRoute7_Object:
+	db $a ; border block
+
+	db 3 ; warps
+	warp 3, 7, 4, -1
+	warp 4, 7, 4, -1
+	warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST
+
+	db 0 ; signs
+
+	db 1 ; objects
+	object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person
+
+	; warp-to
+	warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH
+	warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_WIDTH
+	warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WEST_EAST
diff --git a/data/mapObjects/UndergroundPathRoute7Copy.asm b/data/mapObjects/UndergroundPathRoute7Copy.asm
new file mode 100755
index 00000000..c020646e
--- /dev/null
+++ b/data/mapObjects/UndergroundPathRoute7Copy.asm
@@ -0,0 +1,18 @@
+UndergroundPathRoute7Copy_Object:
+	db $a ; border block
+
+	db 3 ; warps
+	warp 3, 7, 5, -1
+	warp 4, 7, 5, -1
+	warp 4, 4, 0, UNDERGROUND_PATH_WEST_EAST
+
+	db 0 ; signs
+
+	db 2 ; objects
+	object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person
+	object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person
+
+	; warp-to
+	warp_to 3, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH
+	warp_to 4, 7, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH
+	warp_to 4, 4, UNDERGROUND_PATH_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WEST_EAST
diff --git a/data/mapObjects/UndergroundPathRoute8.asm b/data/mapObjects/UndergroundPathRoute8.asm
new file mode 100755
index 00000000..8be0d474
--- /dev/null
+++ b/data/mapObjects/UndergroundPathRoute8.asm
@@ -0,0 +1,17 @@
+UndergroundPathRoute8_Object:
+	db $a ; border block
+
+	db 3 ; warps
+	warp 3, 7, 4, -1
+	warp 4, 7, 4, -1
+	warp 4, 4, 1, UNDERGROUND_PATH_WEST_EAST
+
+	db 0 ; signs
+
+	db 1 ; objects
+	object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person
+
+	; warp-to
+	warp_to 3, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH
+	warp_to 4, 7, UNDERGROUND_PATH_ROUTE_8_WIDTH
+	warp_to 4, 4, UNDERGROUND_PATH_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WEST_EAST
diff --git a/data/mapObjects/UndergroundPathWestEast.asm b/data/mapObjects/UndergroundPathWestEast.asm
new file mode 100755
index 00000000..fa064aca
--- /dev/null
+++ b/data/mapObjects/UndergroundPathWestEast.asm
@@ -0,0 +1,14 @@
+UndergroundPathWestEast_Object:
+	db $1 ; border block
+
+	db 2 ; warps
+	warp 2, 5, 2, UNDERGROUND_PATH_ROUTE_7
+	warp 47, 2, 2, UNDERGROUND_PATH_ROUTE_8
+
+	db 0 ; signs
+
+	db 0 ; objects
+
+	; warp-to
+	warp_to 2, 5, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_7
+	warp_to 47, 2, UNDERGROUND_PATH_WEST_EAST_WIDTH ; UNDERGROUND_PATH_ROUTE_8
diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/VermilionCity.asm
index 86cc5685..b1e1a005 100755
--- a/data/mapObjects/vermilioncity.asm
+++ b/data/mapObjects/VermilionCity.asm
@@ -1,4 +1,4 @@
-VermilionCityObject:
+VermilionCity_Object:
 	db $43 ; border block
 
 	db 9 ; warps
@@ -6,11 +6,11 @@ VermilionCityObject:
 	warp 9, 13, 0, POKEMON_FAN_CLUB
 	warp 23, 13, 0, VERMILION_MART
 	warp 12, 19, 0, VERMILION_GYM
-	warp 23, 19, 0, VERMILION_HOUSE_1
+	warp 23, 19, 0, VERMILION_PIDGEY_HOUSE
 	warp 18, 31, 0, VERMILION_DOCK
 	warp 19, 31, 0, VERMILION_DOCK
-	warp 15, 13, 0, VERMILION_HOUSE_3
-	warp 7, 3, 0, VERMILION_HOUSE_2
+	warp 15, 13, 0, VERMILION_TRADE_HOUSE
+	warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE
 
 	db 7 ; signs
 	sign 27, 3, 7 ; VermilionCityText7
@@ -34,8 +34,8 @@ VermilionCityObject:
 	warp_to 9, 13, VERMILION_CITY_WIDTH ; POKEMON_FAN_CLUB
 	warp_to 23, 13, VERMILION_CITY_WIDTH ; VERMILION_MART
 	warp_to 12, 19, VERMILION_CITY_WIDTH ; VERMILION_GYM
-	warp_to 23, 19, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_1
+	warp_to 23, 19, VERMILION_CITY_WIDTH ; VERMILION_PIDGEY_HOUSE
 	warp_to 18, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK
 	warp_to 19, 31, VERMILION_CITY_WIDTH ; VERMILION_DOCK
-	warp_to 15, 13, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_3
-	warp_to 7, 3, VERMILION_CITY_WIDTH ; VERMILION_HOUSE_2
+	warp_to 15, 13, VERMILION_CITY_WIDTH ; VERMILION_TRADE_HOUSE
+	warp_to 7, 3, VERMILION_CITY_WIDTH ; VERMILION_OLD_ROD_HOUSE
diff --git a/data/mapObjects/vermiliondock.asm b/data/mapObjects/VermilionDock.asm
index 289689b5..6f07554a 100755
--- a/data/mapObjects/vermiliondock.asm
+++ b/data/mapObjects/VermilionDock.asm
@@ -1,9 +1,9 @@
-VermilionDockObject:
+VermilionDock_Object:
 	db $f ; border block
 
 	db 2 ; warps
 	warp 14, 0, 5, -1
-	warp 14, 2, 1, SS_ANNE_1
+	warp 14, 2, 1, SS_ANNE_1F
 
 	db 0 ; signs
 
@@ -11,4 +11,4 @@ VermilionDockObject:
 
 	; warp-to
 	warp_to 14, 0, VERMILION_DOCK_WIDTH
-	warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1
+	warp_to 14, 2, VERMILION_DOCK_WIDTH ; SS_ANNE_1F
diff --git a/data/mapObjects/vermiliongym.asm b/data/mapObjects/VermilionGym.asm
index 843454c0..4ace83be 100755
--- a/data/mapObjects/vermiliongym.asm
+++ b/data/mapObjects/VermilionGym.asm
@@ -1,4 +1,4 @@
-VermilionGymObject:
+VermilionGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/vermilionmart.asm b/data/mapObjects/VermilionMart.asm
index f5b15c7d..74bcf35f 100755
--- a/data/mapObjects/vermilionmart.asm
+++ b/data/mapObjects/VermilionMart.asm
@@ -1,4 +1,4 @@
-VermilionMartObject:
+VermilionMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/vermilionhouse2.asm b/data/mapObjects/VermilionOldRodHouse.asm
index e612b06a..f5b4b96a 100755
--- a/data/mapObjects/vermilionhouse2.asm
+++ b/data/mapObjects/VermilionOldRodHouse.asm
@@ -1,4 +1,4 @@
-VermilionHouse2Object:
+VermilionOldRodHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -11,5 +11,5 @@ VermilionHouse2Object:
 	object SPRITE_FISHER, 2, 4, STAY, RIGHT, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, VERMILION_HOUSE_2_WIDTH
-	warp_to 3, 7, VERMILION_HOUSE_2_WIDTH
+	warp_to 2, 7, VERMILION_OLD_ROD_HOUSE_WIDTH
+	warp_to 3, 7, VERMILION_OLD_ROD_HOUSE_WIDTH
diff --git a/data/mapObjects/vermilionhouse1.asm b/data/mapObjects/VermilionPidgeyHouse.asm
index bbb7491b..0e820f86 100755
--- a/data/mapObjects/vermilionhouse1.asm
+++ b/data/mapObjects/VermilionPidgeyHouse.asm
@@ -1,4 +1,4 @@
-VermilionHouse1Object:
+VermilionPidgeyHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -13,5 +13,5 @@ VermilionHouse1Object:
 	object SPRITE_PAPER_SHEET, 4, 3, STAY, NONE, 3 ; person
 
 	; warp-to
-	warp_to 2, 7, VERMILION_HOUSE_1_WIDTH
-	warp_to 3, 7, VERMILION_HOUSE_1_WIDTH
+	warp_to 2, 7, VERMILION_PIDGEY_HOUSE_WIDTH
+	warp_to 3, 7, VERMILION_PIDGEY_HOUSE_WIDTH
diff --git a/data/mapObjects/vermilionpokecenter.asm b/data/mapObjects/VermilionPokecenter.asm
index da792d34..d2142045 100755
--- a/data/mapObjects/vermilionpokecenter.asm
+++ b/data/mapObjects/VermilionPokecenter.asm
@@ -1,4 +1,4 @@
-VermilionPokecenterObject:
+VermilionPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/VermilionTradeHouse.asm
index a6dd42fa..30212b2a 100755
--- a/data/mapObjects/vermilionhouse3.asm
+++ b/data/mapObjects/VermilionTradeHouse.asm
@@ -1,4 +1,4 @@
-VermilionHouse3Object:
+VermilionTradeHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -11,5 +11,5 @@ VermilionHouse3Object:
 	object SPRITE_LITTLE_GIRL, 3, 5, STAY, UP, 1 ; person
 
 	; warp-to
-	warp_to 2, 7, VERMILION_HOUSE_3_WIDTH
-	warp_to 3, 7, VERMILION_HOUSE_3_WIDTH
+	warp_to 2, 7, VERMILION_TRADE_HOUSE_WIDTH
+	warp_to 3, 7, VERMILION_TRADE_HOUSE_WIDTH
diff --git a/data/mapObjects/victoryroad1.asm b/data/mapObjects/VictoryRoad1F.asm
index 62309bbd..cc0c47ce 100755
--- a/data/mapObjects/victoryroad1.asm
+++ b/data/mapObjects/VictoryRoad1F.asm
@@ -1,10 +1,10 @@
-VictoryRoad1Object:
+VictoryRoad1F_Object:
 	db $7d ; border block
 
 	db 3 ; warps
 	warp 8, 17, 2, -1
 	warp 9, 17, 2, -1
-	warp 1, 1, 0, VICTORY_ROAD_2
+	warp 1, 1, 0, VICTORY_ROAD_2F
 
 	db 0 ; signs
 
@@ -18,6 +18,6 @@ VictoryRoad1Object:
 	object SPRITE_BOULDER, 2, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person
 
 	; warp-to
-	warp_to 8, 17, VICTORY_ROAD_1_WIDTH
-	warp_to 9, 17, VICTORY_ROAD_1_WIDTH
-	warp_to 1, 1, VICTORY_ROAD_1_WIDTH ; VICTORY_ROAD_2
+	warp_to 8, 17, VICTORY_ROAD_1F_WIDTH
+	warp_to 9, 17, VICTORY_ROAD_1F_WIDTH
+	warp_to 1, 1, VICTORY_ROAD_1F_WIDTH ; VICTORY_ROAD_2F
diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/VictoryRoad2F.asm
index 283e74c8..55559bca 100755
--- a/data/mapObjects/victoryroad2.asm
+++ b/data/mapObjects/VictoryRoad2F.asm
@@ -1,14 +1,14 @@
-VictoryRoad2Object:
+VictoryRoad2F_Object:
 	db $7d ; border block
 
 	db 7 ; warps
-	warp 0, 8, 2, VICTORY_ROAD_1
+	warp 0, 8, 2, VICTORY_ROAD_1F
 	warp 29, 7, 3, -1
 	warp 29, 8, 3, -1
-	warp 23, 7, 0, VICTORY_ROAD_3
-	warp 25, 14, 2, VICTORY_ROAD_3
-	warp 27, 7, 1, VICTORY_ROAD_3
-	warp 1, 1, 3, VICTORY_ROAD_3
+	warp 23, 7, 0, VICTORY_ROAD_3F
+	warp 25, 14, 2, VICTORY_ROAD_3F
+	warp 27, 7, 1, VICTORY_ROAD_3F
+	warp 1, 1, 3, VICTORY_ROAD_3F
 
 	db 0 ; signs
 
@@ -28,10 +28,10 @@ VictoryRoad2Object:
 	object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person
 
 	; warp-to
-	warp_to 0, 8, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_1
-	warp_to 29, 7, VICTORY_ROAD_2_WIDTH
-	warp_to 29, 8, VICTORY_ROAD_2_WIDTH
-	warp_to 23, 7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3
-	warp_to 25, 14, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3
-	warp_to 27, 7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3
-	warp_to 1, 1, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3
+	warp_to 0, 8, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_1F
+	warp_to 29, 7, VICTORY_ROAD_2F_WIDTH
+	warp_to 29, 8, VICTORY_ROAD_2F_WIDTH
+	warp_to 23, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
+	warp_to 25, 14, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
+	warp_to 27, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
+	warp_to 1, 1, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F
diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/VictoryRoad3F.asm
index ffa2a843..2eb42417 100755
--- a/data/mapObjects/victoryroad3.asm
+++ b/data/mapObjects/VictoryRoad3F.asm
@@ -1,11 +1,11 @@
-VictoryRoad3Object:
+VictoryRoad3F_Object:
 	db $7d ; border block
 
 	db 4 ; warps
-	warp 23, 7, 3, VICTORY_ROAD_2
-	warp 26, 8, 5, VICTORY_ROAD_2
-	warp 27, 15, 4, VICTORY_ROAD_2
-	warp 2, 0, 6, VICTORY_ROAD_2
+	warp 23, 7, 3, VICTORY_ROAD_2F
+	warp 26, 8, 5, VICTORY_ROAD_2F
+	warp 27, 15, 4, VICTORY_ROAD_2F
+	warp 2, 0, 6, VICTORY_ROAD_2F
 
 	db 0 ; signs
 
@@ -22,7 +22,7 @@ VictoryRoad3Object:
 	object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person
 
 	; warp-to
-	warp_to 23, 7, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2
-	warp_to 26, 8, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2
-	warp_to 27, 15, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2
-	warp_to 2, 0, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2
+	warp_to 23, 7, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
+	warp_to 26, 8, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
+	warp_to 27, 15, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
+	warp_to 2, 0, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F
diff --git a/data/mapObjects/viridiancity.asm b/data/mapObjects/ViridianCity.asm
index b45ba9d5..32fe8d3a 100755
--- a/data/mapObjects/viridiancity.asm
+++ b/data/mapObjects/ViridianCity.asm
@@ -1,11 +1,11 @@
-ViridianCityObject:
+ViridianCity_Object:
 	db $f ; border block
 
 	db 5 ; warps
 	warp 23, 25, 0, VIRIDIAN_POKECENTER
 	warp 29, 19, 0, VIRIDIAN_MART
-	warp 21, 15, 0, VIRIDIAN_SCHOOL
-	warp 21, 9, 0, VIRIDIAN_HOUSE
+	warp 21, 15, 0, VIRIDIAN_SCHOOL_HOUSE
+	warp 21, 9, 0, VIRIDIAN_NICKNAME_HOUSE
 	warp 32, 7, 0, VIRIDIAN_GYM
 
 	db 6 ; signs
@@ -28,6 +28,6 @@ ViridianCityObject:
 	; warp-to
 	warp_to 23, 25, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_POKECENTER
 	warp_to 29, 19, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_MART
-	warp_to 21, 15, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL
-	warp_to 21, 9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_HOUSE
+	warp_to 21, 15, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_SCHOOL_HOUSE
+	warp_to 21, 9, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_NICKNAME_HOUSE
 	warp_to 32, 7, VIRIDIAN_CITY_WIDTH ; VIRIDIAN_GYM
diff --git a/data/mapObjects/viridianforest.asm b/data/mapObjects/ViridianForest.asm
index 601f73e2..cbcb6ff8 100755
--- a/data/mapObjects/viridianforest.asm
+++ b/data/mapObjects/ViridianForest.asm
@@ -1,13 +1,13 @@
-ViridianForestObject:
+ViridianForest_Object:
 	db $3 ; border block
 
 	db 6 ; warps
-	warp 1, 0, 2, VIRIDIAN_FOREST_EXIT
-	warp 2, 0, 3, VIRIDIAN_FOREST_EXIT
-	warp 15, 47, 1, VIRIDIAN_FOREST_ENTRANCE
-	warp 16, 47, 1, VIRIDIAN_FOREST_ENTRANCE
-	warp 17, 47, 1, VIRIDIAN_FOREST_ENTRANCE
-	warp 18, 47, 1, VIRIDIAN_FOREST_ENTRANCE
+	warp 1, 0, 2, VIRIDIAN_FOREST_NORTH_GATE
+	warp 2, 0, 3, VIRIDIAN_FOREST_NORTH_GATE
+	warp 15, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
+	warp 16, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
+	warp 17, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
+	warp 18, 47, 1, VIRIDIAN_FOREST_SOUTH_GATE
 
 	db 6 ; signs
 	sign 24, 40, 9 ; ViridianForestText9
@@ -28,9 +28,9 @@ ViridianForestObject:
 	object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 8 ; person
 
 	; warp-to
-	warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT
-	warp_to 2, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_EXIT
-	warp_to 15, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE
-	warp_to 16, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE
-	warp_to 17, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE
-	warp_to 18, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_ENTRANCE
+	warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE
+	warp_to 2, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE
+	warp_to 15, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
+	warp_to 16, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
+	warp_to 17, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
+	warp_to 18, 47, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_SOUTH_GATE
diff --git a/data/mapObjects/viridianforestexit.asm b/data/mapObjects/ViridianForestNorthGate.asm
index 521ad818..81e7fece 100755
--- a/data/mapObjects/viridianforestexit.asm
+++ b/data/mapObjects/ViridianForestNorthGate.asm
@@ -1,4 +1,4 @@
-ViridianForestExitObject:
+ViridianForestNorthGate_Object:
 	db $a ; border block
 
 	db 4 ; warps
@@ -14,7 +14,7 @@ ViridianForestExitObject:
 	object SPRITE_OLD_PERSON, 2, 5, STAY, NONE, 2 ; person
 
 	; warp-to
-	warp_to 4, 0, VIRIDIAN_FOREST_EXIT_WIDTH
-	warp_to 5, 0, VIRIDIAN_FOREST_EXIT_WIDTH
-	warp_to 4, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST
-	warp_to 5, 7, VIRIDIAN_FOREST_EXIT_WIDTH ; VIRIDIAN_FOREST
+	warp_to 4, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH
+	warp_to 5, 0, VIRIDIAN_FOREST_NORTH_GATE_WIDTH
+	warp_to 4, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST
+	warp_to 5, 7, VIRIDIAN_FOREST_NORTH_GATE_WIDTH ; VIRIDIAN_FOREST
diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/ViridianForestSouthGate.asm
index 319ba272..76f87e51 100755
--- a/data/mapObjects/viridianforestentrance.asm
+++ b/data/mapObjects/ViridianForestSouthGate.asm
@@ -1,4 +1,4 @@
-ViridianForestEntranceObject:
+ViridianForestSouthGate_Object:
 	db $a ; border block
 
 	db 4 ; warps
@@ -14,7 +14,7 @@ ViridianForestEntranceObject:
 	object SPRITE_LITTLE_GIRL, 2, 4, WALK, 1, 2 ; person
 
 	; warp-to
-	warp_to 4, 0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST
-	warp_to 5, 0, VIRIDIAN_FOREST_ENTRANCE_WIDTH ; VIRIDIAN_FOREST
-	warp_to 4, 7, VIRIDIAN_FOREST_ENTRANCE_WIDTH
-	warp_to 5, 7, VIRIDIAN_FOREST_ENTRANCE_WIDTH
+	warp_to 4, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST
+	warp_to 5, 0, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH ; VIRIDIAN_FOREST
+	warp_to 4, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH
+	warp_to 5, 7, VIRIDIAN_FOREST_SOUTH_GATE_WIDTH
diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/ViridianGym.asm
index c6ddb1d4..e3fd17bd 100755
--- a/data/mapObjects/viridiangym.asm
+++ b/data/mapObjects/ViridianGym.asm
@@ -1,4 +1,4 @@
-ViridianGymObject:
+ViridianGym_Object:
 	db $3 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/viridianmart.asm b/data/mapObjects/ViridianMart.asm
index e692f810..b3e7fee5 100755
--- a/data/mapObjects/viridianmart.asm
+++ b/data/mapObjects/ViridianMart.asm
@@ -1,4 +1,4 @@
-ViridianMartObject:
+ViridianMart_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/viridianhouse.asm b/data/mapObjects/ViridianNicknameHouse.asm
index 932542a6..aaf20a91 100755
--- a/data/mapObjects/viridianhouse.asm
+++ b/data/mapObjects/ViridianNicknameHouse.asm
@@ -1,4 +1,4 @@
-ViridianHouseObject:
+ViridianNicknameHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -14,5 +14,5 @@ ViridianHouseObject:
 	object SPRITE_CLIPBOARD, 4, 0, STAY, NONE, 4 ; person
 
 	; warp-to
-	warp_to 2, 7, VIRIDIAN_HOUSE_WIDTH
-	warp_to 3, 7, VIRIDIAN_HOUSE_WIDTH
+	warp_to 2, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH
+	warp_to 3, 7, VIRIDIAN_NICKNAME_HOUSE_WIDTH
diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/ViridianPokecenter.asm
index 9c8ebbfe..43b73e68 100755
--- a/data/mapObjects/viridianpokecenter.asm
+++ b/data/mapObjects/ViridianPokecenter.asm
@@ -1,4 +1,4 @@
-ViridianPokecenterObject:
+ViridianPokecenter_Object:
 	db $0 ; border block
 
 	db 2 ; warps
diff --git a/data/mapObjects/school.asm b/data/mapObjects/ViridianSchoolHouse.asm
index 8f07144f..01f2465d 100755
--- a/data/mapObjects/school.asm
+++ b/data/mapObjects/ViridianSchoolHouse.asm
@@ -1,4 +1,4 @@
-SchoolObject:
+ViridianSchoolHouse_Object:
 	db $a ; border block
 
 	db 2 ; warps
@@ -12,5 +12,5 @@ SchoolObject:
 	object SPRITE_LASS, 4, 1, STAY, DOWN, 2 ; person
 
 	; warp-to
-	warp_to 2, 7, VIRIDIAN_SCHOOL_WIDTH
-	warp_to 3, 7, VIRIDIAN_SCHOOL_WIDTH
+	warp_to 2, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH
+	warp_to 3, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH
diff --git a/data/mapObjects/fuchsiahouse2.asm b/data/mapObjects/WardensHouse.asm
index e3702594..d8445738 100755
--- a/data/mapObjects/fuchsiahouse2.asm
+++ b/data/mapObjects/WardensHouse.asm
@@ -1,4 +1,4 @@
-FuchsiaHouse2Object:
+WardensHouse_Object:
 	db $17 ; border block
 
 	db 2 ; warps
@@ -15,5 +15,5 @@ FuchsiaHouse2Object:
 	object SPRITE_BOULDER, 8, 4, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
 
 	; warp-to
-	warp_to 4, 7, FUCHSIA_HOUSE_2_WIDTH
-	warp_to 5, 7, FUCHSIA_HOUSE_2_WIDTH
+	warp_to 4, 7, WARDENS_HOUSE_WIDTH
+	warp_to 5, 7, WARDENS_HOUSE_WIDTH
diff --git a/data/mapObjects/celadonmansion2.asm b/data/mapObjects/celadonmansion2.asm
deleted file mode 100755
index f2b96d89..00000000
--- a/data/mapObjects/celadonmansion2.asm
+++ /dev/null
@@ -1,19 +0,0 @@
-CeladonMansion2Object:
-	db $f ; border block
-
-	db 4 ; warps
-	warp 6, 1, 0, CELADON_MANSION_3
-	warp 7, 1, 3, CELADON_MANSION_1
-	warp 2, 1, 4, CELADON_MANSION_1
-	warp 4, 1, 3, CELADON_MANSION_3
-
-	db 1 ; signs
-	sign 4, 9, 1 ; CeladonMansion2Text1
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 6, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3
-	warp_to 7, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1
-	warp_to 2, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_1
-	warp_to 4, 1, CELADON_MANSION_2_WIDTH ; CELADON_MANSION_3
diff --git a/data/mapObjects/celadonmansion4.asm b/data/mapObjects/celadonmansion4.asm
deleted file mode 100755
index 98f538eb..00000000
--- a/data/mapObjects/celadonmansion4.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-CeladonMansion4Object:
-	db $9 ; border block
-
-	db 3 ; warps
-	warp 6, 1, 1, CELADON_MANSION_3
-	warp 2, 1, 2, CELADON_MANSION_3
-	warp 2, 7, 0, CELADON_MANSION_5
-
-	db 1 ; signs
-	sign 3, 7, 1 ; CeladonMansion4Text1
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 6, 1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3
-	warp_to 2, 1, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_3
-	warp_to 2, 7, CELADON_MANSION_4_WIDTH ; CELADON_MANSION_5
diff --git a/data/mapObjects/celadonmansion5.asm b/data/mapObjects/celadonmansion5.asm
deleted file mode 100755
index 0fd06d13..00000000
--- a/data/mapObjects/celadonmansion5.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-CeladonMansion5Object:
-	db $a ; border block
-
-	db 2 ; warps
-	warp 2, 7, 2, CELADON_MANSION_4
-	warp 3, 7, 2, CELADON_MANSION_4
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_HIKER, 2, 2, STAY, DOWN, 1 ; person
-	object SPRITE_BALL, 4, 3, STAY, NONE, 2 ; person
-
-	; warp-to
-	warp_to 2, 7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4
-	warp_to 3, 7, CELADON_MANSION_5_WIDTH ; CELADON_MANSION_4
diff --git a/data/mapObjects/celadonmartelevator.asm b/data/mapObjects/celadonmartelevator.asm
deleted file mode 100755
index 49745aa9..00000000
--- a/data/mapObjects/celadonmartelevator.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-CeladonMartElevatorObject:
-	db $f ; border block
-
-	db 2 ; warps
-	warp 1, 3, 5, CELADON_MART_1
-	warp 2, 3, 5, CELADON_MART_1
-
-	db 1 ; signs
-	sign 3, 0, 1 ; CeladonMartElevatorText1
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 1, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1
-	warp_to 2, 3, CELADON_MART_ELEVATOR_WIDTH ; CELADON_MART_1
diff --git a/data/mapObjects/diglettscave.asm b/data/mapObjects/diglettscave.asm
deleted file mode 100755
index ef4de039..00000000
--- a/data/mapObjects/diglettscave.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-DiglettsCaveObject:
-	db $19 ; border block
-
-	db 2 ; warps
-	warp 5, 5, 2, DIGLETTS_CAVE_EXIT
-	warp 37, 31, 2, DIGLETTS_CAVE_ENTRANCE
-
-	db 0 ; signs
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 5, 5, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_EXIT
-	warp_to 37, 31, DIGLETTS_CAVE_WIDTH ; DIGLETTS_CAVE_ENTRANCE
diff --git a/data/mapObjects/lab1.asm b/data/mapObjects/lab1.asm
deleted file mode 100755
index b9eea581..00000000
--- a/data/mapObjects/lab1.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-Lab1Object:
-	db $17 ; border block
-
-	db 5 ; warps
-	warp 2, 7, 2, -1
-	warp 3, 7, 2, -1
-	warp 8, 4, 0, CINNABAR_LAB_2
-	warp 12, 4, 0, CINNABAR_LAB_3
-	warp 16, 4, 0, CINNABAR_LAB_4
-
-	db 4 ; signs
-	sign 3, 2, 2 ; Lab1Text2
-	sign 9, 4, 3 ; Lab1Text3
-	sign 13, 4, 4 ; Lab1Text4
-	sign 17, 4, 5 ; Lab1Text5
-
-	db 1 ; objects
-	object SPRITE_FISHER, 1, 3, STAY, NONE, 1 ; person
-
-	; warp-to
-	warp_to 2, 7, CINNABAR_LAB_1_WIDTH
-	warp_to 3, 7, CINNABAR_LAB_1_WIDTH
-	warp_to 8, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_2
-	warp_to 12, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_3
-	warp_to 16, 4, CINNABAR_LAB_1_WIDTH ; CINNABAR_LAB_4
diff --git a/data/mapObjects/lab4.asm b/data/mapObjects/lab4.asm
deleted file mode 100755
index b9956f5f..00000000
--- a/data/mapObjects/lab4.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-Lab4Object:
-	db $17 ; border block
-
-	db 2 ; warps
-	warp 2, 7, 4, CINNABAR_LAB_1
-	warp 3, 7, 4, CINNABAR_LAB_1
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person
-	object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person
-
-	; warp-to
-	warp_to 2, 7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1
-	warp_to 3, 7, CINNABAR_LAB_4_WIDTH ; CINNABAR_LAB_1
diff --git a/data/mapObjects/mansion1.asm b/data/mapObjects/mansion1.asm
deleted file mode 100755
index fe543f27..00000000
--- a/data/mapObjects/mansion1.asm
+++ /dev/null
@@ -1,29 +0,0 @@
-Mansion1Object:
-	db $2e ; border block
-
-	db 8 ; warps
-	warp 4, 27, 0, -1
-	warp 5, 27, 0, -1
-	warp 6, 27, 0, -1
-	warp 7, 27, 0, -1
-	warp 5, 10, 0, MANSION_2
-	warp 21, 23, 0, MANSION_4
-	warp 26, 27, 0, -1
-	warp 27, 27, 0, -1
-
-	db 0 ; signs
-
-	db 3 ; objects
-	object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4
-	object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE
-	object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS
-
-	; warp-to
-	warp_to 4, 27, MANSION_1_WIDTH
-	warp_to 5, 27, MANSION_1_WIDTH
-	warp_to 6, 27, MANSION_1_WIDTH
-	warp_to 7, 27, MANSION_1_WIDTH
-	warp_to 5, 10, MANSION_1_WIDTH ; MANSION_2
-	warp_to 21, 23, MANSION_1_WIDTH ; MANSION_4
-	warp_to 26, 27, MANSION_1_WIDTH
-	warp_to 27, 27, MANSION_1_WIDTH
diff --git a/data/mapObjects/mansion2.asm b/data/mapObjects/mansion2.asm
deleted file mode 100755
index cea8c8fc..00000000
--- a/data/mapObjects/mansion2.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-Mansion2Object:
-	db $1 ; border block
-
-	db 4 ; warps
-	warp 5, 10, 4, MANSION_1
-	warp 7, 10, 0, MANSION_3
-	warp 25, 14, 2, MANSION_3
-	warp 6, 1, 1, MANSION_3
-
-	db 0 ; signs
-
-	db 4 ; objects
-	object SPRITE_BLACK_HAIR_BOY_2, 3, 17, WALK, 2, 1, OPP_BURGLAR, 7
-	object SPRITE_BALL, 28, 7, STAY, NONE, 2, CALCIUM
-	object SPRITE_BOOK_MAP_DEX, 18, 2, STAY, NONE, 3 ; person
-	object SPRITE_BOOK_MAP_DEX, 3, 22, STAY, NONE, 4 ; person
-
-	; warp-to
-	warp_to 5, 10, MANSION_2_WIDTH ; MANSION_1
-	warp_to 7, 10, MANSION_2_WIDTH ; MANSION_3
-	warp_to 25, 14, MANSION_2_WIDTH ; MANSION_3
-	warp_to 6, 1, MANSION_2_WIDTH ; MANSION_3
diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm
deleted file mode 100755
index abff4094..00000000
--- a/data/mapObjects/mtmoon2.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-MtMoon2Object:
-	db $3 ; border block
-
-	db 8 ; warps
-	warp 5, 5, 2, MT_MOON_1
-	warp 17, 11, 0, MT_MOON_3
-	warp 25, 9, 3, MT_MOON_1
-	warp 25, 15, 4, MT_MOON_1
-	warp 21, 17, 1, MT_MOON_3
-	warp 13, 27, 2, MT_MOON_3
-	warp 23, 3, 3, MT_MOON_3
-	warp 27, 3, 2, -1
-
-	db 0 ; signs
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 5, 5, MT_MOON_2_WIDTH ; MT_MOON_1
-	warp_to 17, 11, MT_MOON_2_WIDTH ; MT_MOON_3
-	warp_to 25, 9, MT_MOON_2_WIDTH ; MT_MOON_1
-	warp_to 25, 15, MT_MOON_2_WIDTH ; MT_MOON_1
-	warp_to 21, 17, MT_MOON_2_WIDTH ; MT_MOON_3
-	warp_to 13, 27, MT_MOON_2_WIDTH ; MT_MOON_3
-	warp_to 23, 3, MT_MOON_2_WIDTH ; MT_MOON_3
-	warp_to 27, 3, MT_MOON_2_WIDTH
diff --git a/data/mapObjects/pokemontower2.asm b/data/mapObjects/pokemontower2.asm
deleted file mode 100755
index 80615cd5..00000000
--- a/data/mapObjects/pokemontower2.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-PokemonTower2Object:
-	db $1 ; border block
-
-	db 2 ; warps
-	warp 3, 9, 0, POKEMONTOWER_3
-	warp 18, 9, 2, POKEMONTOWER_1
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person
-	object SPRITE_MEDIUM, 3, 7, STAY, RIGHT, 2 ; person
-
-	; warp-to
-	warp_to 3, 9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_3
-	warp_to 18, 9, POKEMONTOWER_2_WIDTH ; POKEMONTOWER_1
diff --git a/data/mapObjects/rockethideout2.asm b/data/mapObjects/rockethideout2.asm
deleted file mode 100755
index 328a4fb5..00000000
--- a/data/mapObjects/rockethideout2.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-RocketHideout2Object:
-	db $2e ; border block
-
-	db 5 ; warps
-	warp 27, 8, 0, ROCKET_HIDEOUT_1
-	warp 21, 8, 0, ROCKET_HIDEOUT_3
-	warp 24, 19, 0, ROCKET_HIDEOUT_ELEVATOR
-	warp 21, 22, 3, ROCKET_HIDEOUT_1
-	warp 25, 19, 1, ROCKET_HIDEOUT_ELEVATOR
-
-	db 0 ; signs
-
-	db 5 ; objects
-	object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13
-	object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE
-	object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET
-	object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_07
-	object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION
-
-	; warp-to
-	warp_to 27, 8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1
-	warp_to 21, 8, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_3
-	warp_to 24, 19, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
-	warp_to 21, 22, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_1
-	warp_to 25, 19, ROCKET_HIDEOUT_2_WIDTH ; ROCKET_HIDEOUT_ELEVATOR
diff --git a/data/mapObjects/rockethideoutelevator.asm b/data/mapObjects/rockethideoutelevator.asm
deleted file mode 100755
index 583c9f89..00000000
--- a/data/mapObjects/rockethideoutelevator.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-RocketHideoutElevatorObject:
-	db $f ; border block
-
-	db 2 ; warps
-	warp 2, 1, 2, ROCKET_HIDEOUT_1
-	warp 3, 1, 4, ROCKET_HIDEOUT_1
-
-	db 1 ; signs
-	sign 1, 1, 1 ; RocketHideoutElevatorText1
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 2, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1
-	warp_to 3, 1, ROCKET_HIDEOUT_ELEVATOR_WIDTH ; ROCKET_HIDEOUT_1
diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm
deleted file mode 100755
index a1617004..00000000
--- a/data/mapObjects/seafoamislands1.asm
+++ /dev/null
@@ -1,30 +0,0 @@
-SeafoamIslands1Object:
-	db $7d ; border block
-
-	db 7 ; warps
-	warp 4, 17, 0, -1
-	warp 5, 17, 0, -1
-	warp 26, 17, 1, -1
-	warp 27, 17, 1, -1
-	warp 7, 5, 1, SEAFOAM_ISLANDS_2
-	warp 25, 3, 6, SEAFOAM_ISLANDS_2
-	warp 23, 15, 4, SEAFOAM_ISLANDS_2
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_BOULDER, 18, 10, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
-	object SPRITE_BOULDER, 26, 7, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
-
-	; warp-to
-	warp_to 4, 17, SEAFOAM_ISLANDS_1_WIDTH
-	warp_to 5, 17, SEAFOAM_ISLANDS_1_WIDTH
-	warp_to 26, 17, SEAFOAM_ISLANDS_1_WIDTH
-	warp_to 27, 17, SEAFOAM_ISLANDS_1_WIDTH
-	warp_to 7, 5, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2
-	warp_to 25, 3, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2
-	warp_to 23, 15, SEAFOAM_ISLANDS_1_WIDTH ; SEAFOAM_ISLANDS_2
-
-	; holes
-	warp_to 17, 6, SEAFOAM_ISLANDS_1_WIDTH
-	warp_to 24, 6, SEAFOAM_ISLANDS_1_WIDTH
diff --git a/data/mapObjects/seafoamislands2.asm b/data/mapObjects/seafoamislands2.asm
deleted file mode 100755
index 76c2ce3c..00000000
--- a/data/mapObjects/seafoamislands2.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-SeafoamIslands2Object:
-	db $7d ; border block
-
-	db 7 ; warps
-	warp 4, 2, 0, SEAFOAM_ISLANDS_3
-	warp 7, 5, 4, SEAFOAM_ISLANDS_1
-	warp 13, 7, 2, SEAFOAM_ISLANDS_3
-	warp 19, 15, 3, SEAFOAM_ISLANDS_3
-	warp 23, 15, 6, SEAFOAM_ISLANDS_1
-	warp 25, 11, 5, SEAFOAM_ISLANDS_3
-	warp 25, 3, 5, SEAFOAM_ISLANDS_1
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_BOULDER, 17, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
-	object SPRITE_BOULDER, 22, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
-
-	; warp-to
-	warp_to 4, 2, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3
-	warp_to 7, 5, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1
-	warp_to 13, 7, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3
-	warp_to 19, 15, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3
-	warp_to 23, 15, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1
-	warp_to 25, 11, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_3
-	warp_to 25, 3, SEAFOAM_ISLANDS_2_WIDTH ; SEAFOAM_ISLANDS_1
diff --git a/data/mapObjects/seafoamislands3.asm b/data/mapObjects/seafoamislands3.asm
deleted file mode 100755
index a5cb848a..00000000
--- a/data/mapObjects/seafoamislands3.asm
+++ /dev/null
@@ -1,26 +0,0 @@
-SeafoamIslands3Object:
-	db $7d ; border block
-
-	db 7 ; warps
-	warp 5, 3, 0, SEAFOAM_ISLANDS_2
-	warp 5, 13, 0, SEAFOAM_ISLANDS_4
-	warp 13, 7, 2, SEAFOAM_ISLANDS_2
-	warp 19, 15, 3, SEAFOAM_ISLANDS_2
-	warp 25, 3, 3, SEAFOAM_ISLANDS_4
-	warp 25, 11, 5, SEAFOAM_ISLANDS_2
-	warp 25, 14, 4, SEAFOAM_ISLANDS_4
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_BOULDER, 18, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
-	object SPRITE_BOULDER, 23, 6, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
-
-	; warp-to
-	warp_to 5, 3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2
-	warp_to 5, 13, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4
-	warp_to 13, 7, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2
-	warp_to 19, 15, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2
-	warp_to 25, 3, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4
-	warp_to 25, 11, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_2
-	warp_to 25, 14, SEAFOAM_ISLANDS_3_WIDTH ; SEAFOAM_ISLANDS_4
diff --git a/data/mapObjects/seafoamislands4.asm b/data/mapObjects/seafoamislands4.asm
deleted file mode 100755
index 0faaae28..00000000
--- a/data/mapObjects/seafoamislands4.asm
+++ /dev/null
@@ -1,30 +0,0 @@
-SeafoamIslands4Object:
-	db $7d ; border block
-
-	db 7 ; warps
-	warp 5, 12, 1, SEAFOAM_ISLANDS_3
-	warp 8, 6, 2, SEAFOAM_ISLANDS_5
-	warp 25, 4, 3, SEAFOAM_ISLANDS_5
-	warp 25, 3, 4, SEAFOAM_ISLANDS_3
-	warp 25, 14, 6, SEAFOAM_ISLANDS_3
-	warp 20, 17, 0, SEAFOAM_ISLANDS_5
-	warp 21, 17, 1, SEAFOAM_ISLANDS_5
-
-	db 0 ; signs
-
-	db 6 ; objects
-	object SPRITE_BOULDER, 5, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 1 ; person
-	object SPRITE_BOULDER, 3, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person
-	object SPRITE_BOULDER, 8, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person
-	object SPRITE_BOULDER, 9, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person
-	object SPRITE_BOULDER, 18, 6, STAY, NONE, 5 ; person
-	object SPRITE_BOULDER, 19, 6, STAY, NONE, 6 ; person
-
-	; warp-to
-	warp_to 5, 12, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3
-	warp_to 8, 6, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5
-	warp_to 25, 4, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5
-	warp_to 25, 3, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3
-	warp_to 25, 14, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_3
-	warp_to 20, 17, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5
-	warp_to 21, 17, SEAFOAM_ISLANDS_4_WIDTH ; SEAFOAM_ISLANDS_5
diff --git a/data/mapObjects/seafoamislands5.asm b/data/mapObjects/seafoamislands5.asm
deleted file mode 100755
index 9bd82887..00000000
--- a/data/mapObjects/seafoamislands5.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-SeafoamIslands5Object:
-	db $7d ; border block
-
-	db 4 ; warps
-	warp 20, 17, 5, SEAFOAM_ISLANDS_4
-	warp 21, 17, 6, SEAFOAM_ISLANDS_4
-	warp 11, 7, 1, SEAFOAM_ISLANDS_4
-	warp 25, 4, 2, SEAFOAM_ISLANDS_4
-
-	db 2 ; signs
-	sign 9, 15, 4 ; SeafoamIslands5Text4
-	sign 23, 1, 5 ; SeafoamIslands5Text5
-
-	db 3 ; objects
-	object SPRITE_BOULDER, 4, 15, STAY, NONE, 1 ; person
-	object SPRITE_BOULDER, 5, 15, STAY, NONE, 2 ; person
-	object SPRITE_BIRD, 6, 1, STAY, DOWN, 3, ARTICUNO, 50
-
-	; warp-to
-	warp_to 20, 17, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4
-	warp_to 21, 17, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4
-	warp_to 11, 7, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4
-	warp_to 25, 4, SEAFOAM_ISLANDS_5_WIDTH ; SEAFOAM_ISLANDS_4
diff --git a/data/mapObjects/ssanne1.asm b/data/mapObjects/ssanne1.asm
deleted file mode 100755
index 9d5ddd1f..00000000
--- a/data/mapObjects/ssanne1.asm
+++ /dev/null
@@ -1,34 +0,0 @@
-SSAnne1Object:
-	db $c ; border block
-
-	db 11 ; warps
-	warp 26, 0, 1, VERMILION_DOCK
-	warp 27, 0, 1, VERMILION_DOCK
-	warp 31, 8, 0, SS_ANNE_8
-	warp 23, 8, 1, SS_ANNE_8
-	warp 19, 8, 2, SS_ANNE_8
-	warp 15, 8, 3, SS_ANNE_8
-	warp 11, 8, 4, SS_ANNE_8
-	warp 7, 8, 5, SS_ANNE_8
-	warp 2, 6, 6, SS_ANNE_2
-	warp 37, 15, 5, SS_ANNE_4
-	warp 3, 16, 0, SS_ANNE_6
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_WAITER, 12, 6, WALK, 2, 1 ; person
-	object SPRITE_SAILOR, 27, 5, STAY, NONE, 2 ; person
-
-	; warp-to
-	warp_to 26, 0, SS_ANNE_1_WIDTH ; VERMILION_DOCK
-	warp_to 27, 0, SS_ANNE_1_WIDTH ; VERMILION_DOCK
-	warp_to 31, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8
-	warp_to 23, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8
-	warp_to 19, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8
-	warp_to 15, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8
-	warp_to 11, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8
-	warp_to 7, 8, SS_ANNE_1_WIDTH ; SS_ANNE_8
-	warp_to 2, 6, SS_ANNE_1_WIDTH ; SS_ANNE_2
-	warp_to 37, 15, SS_ANNE_1_WIDTH ; SS_ANNE_4
-	warp_to 3, 16, SS_ANNE_1_WIDTH ; SS_ANNE_6
diff --git a/data/mapObjects/ssanne10.asm b/data/mapObjects/ssanne10.asm
deleted file mode 100755
index 93fb2cde..00000000
--- a/data/mapObjects/ssanne10.asm
+++ /dev/null
@@ -1,41 +0,0 @@
-SSAnne10Object:
-	db $c ; border block
-
-	db 10 ; warps
-	warp 2, 5, 4, SS_ANNE_4
-	warp 3, 5, 4, SS_ANNE_4
-	warp 12, 5, 3, SS_ANNE_4
-	warp 13, 5, 3, SS_ANNE_4
-	warp 22, 5, 2, SS_ANNE_4
-	warp 23, 5, 2, SS_ANNE_4
-	warp 2, 15, 1, SS_ANNE_4
-	warp 3, 15, 1, SS_ANNE_4
-	warp 12, 15, 0, SS_ANNE_4
-	warp 13, 15, 0, SS_ANNE_4
-
-	db 0 ; signs
-
-	db 11 ; objects
-	object SPRITE_SAILOR, 0, 13, STAY, DOWN, 1, OPP_SAILOR, 3
-	object SPRITE_SAILOR, 2, 11, STAY, DOWN, 2, OPP_SAILOR, 4
-	object SPRITE_SAILOR, 12, 3, STAY, LEFT, 3, OPP_SAILOR, 5
-	object SPRITE_SAILOR, 22, 2, STAY, DOWN, 4, OPP_SAILOR, 6
-	object SPRITE_SAILOR, 0, 2, STAY, RIGHT, 5, OPP_SAILOR, 7
-	object SPRITE_FISHER2, 0, 4, STAY, RIGHT, 6, OPP_FISHER, 2
-	object SPRITE_BLACK_HAIR_BOY_2, 10, 13, STAY, RIGHT, 7 ; person
-	object SPRITE_SLOWBRO, 11, 12, STAY, NONE, 8 ; person
-	object SPRITE_BALL, 20, 2, STAY, NONE, 9, ETHER
-	object SPRITE_BALL, 10, 2, STAY, NONE, 10, TM_44
-	object SPRITE_BALL, 12, 11, STAY, NONE, 11, MAX_POTION
-
-	; warp-to
-	warp_to 2, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4
-	warp_to 3, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4
-	warp_to 12, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4
-	warp_to 13, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4
-	warp_to 22, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4
-	warp_to 23, 5, SS_ANNE_10_WIDTH ; SS_ANNE_4
-	warp_to 2, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4
-	warp_to 3, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4
-	warp_to 12, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4
-	warp_to 13, 15, SS_ANNE_10_WIDTH ; SS_ANNE_4
diff --git a/data/mapObjects/ssanne2.asm b/data/mapObjects/ssanne2.asm
deleted file mode 100755
index 3a685610..00000000
--- a/data/mapObjects/ssanne2.asm
+++ /dev/null
@@ -1,30 +0,0 @@
-SSAnne2Object:
-	db $c ; border block
-
-	db 9 ; warps
-	warp 9, 11, 0, SS_ANNE_9
-	warp 13, 11, 2, SS_ANNE_9
-	warp 17, 11, 4, SS_ANNE_9
-	warp 21, 11, 6, SS_ANNE_9
-	warp 25, 11, 8, SS_ANNE_9
-	warp 29, 11, 10, SS_ANNE_9
-	warp 2, 4, 8, SS_ANNE_1
-	warp 2, 12, 1, SS_ANNE_3
-	warp 36, 4, 0, SS_ANNE_7
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_WAITER, 3, 7, WALK, 1, 1 ; person
-	object SPRITE_BLUE, 36, 4, STAY, DOWN, 2, OPP_SONY1, 1
-
-	; warp-to
-	warp_to 9, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9
-	warp_to 13, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9
-	warp_to 17, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9
-	warp_to 21, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9
-	warp_to 25, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9
-	warp_to 29, 11, SS_ANNE_2_WIDTH ; SS_ANNE_9
-	warp_to 2, 4, SS_ANNE_2_WIDTH ; SS_ANNE_1
-	warp_to 2, 12, SS_ANNE_2_WIDTH ; SS_ANNE_3
-	warp_to 36, 4, SS_ANNE_2_WIDTH ; SS_ANNE_7
diff --git a/data/mapObjects/ssanne3.asm b/data/mapObjects/ssanne3.asm
deleted file mode 100755
index 3a45e1f9..00000000
--- a/data/mapObjects/ssanne3.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-SSAnne3Object:
-	db $c ; border block
-
-	db 2 ; warps
-	warp 0, 3, 0, SS_ANNE_5
-	warp 19, 3, 7, SS_ANNE_2
-
-	db 0 ; signs
-
-	db 1 ; objects
-	object SPRITE_SAILOR, 9, 3, WALK, 2, 1 ; person
-
-	; warp-to
-	warp_to 0, 3, SS_ANNE_3_WIDTH ; SS_ANNE_5
-	warp_to 19, 3, SS_ANNE_3_WIDTH ; SS_ANNE_2
diff --git a/data/mapObjects/ssanne4.asm b/data/mapObjects/ssanne4.asm
deleted file mode 100755
index 7f0d6853..00000000
--- a/data/mapObjects/ssanne4.asm
+++ /dev/null
@@ -1,22 +0,0 @@
-SSAnne4Object:
-	db $c ; border block
-
-	db 6 ; warps
-	warp 23, 3, 8, SS_ANNE_10
-	warp 19, 3, 6, SS_ANNE_10
-	warp 15, 3, 4, SS_ANNE_10
-	warp 11, 3, 2, SS_ANNE_10
-	warp 7, 3, 0, SS_ANNE_10
-	warp 27, 5, 9, SS_ANNE_1
-
-	db 0 ; signs
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 23, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10
-	warp_to 19, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10
-	warp_to 15, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10
-	warp_to 11, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10
-	warp_to 7, 3, SS_ANNE_4_WIDTH ; SS_ANNE_10
-	warp_to 27, 5, SS_ANNE_4_WIDTH ; SS_ANNE_1
diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm
deleted file mode 100755
index 455e6983..00000000
--- a/data/mapObjects/ssanne9.asm
+++ /dev/null
@@ -1,47 +0,0 @@
-SSAnne9Object:
-	db $c ; border block
-
-	db 12 ; warps
-	warp 2, 5, 0, SS_ANNE_2
-	warp 3, 5, 0, SS_ANNE_2
-	warp 12, 5, 1, SS_ANNE_2
-	warp 13, 5, 1, SS_ANNE_2
-	warp 22, 5, 2, SS_ANNE_2
-	warp 23, 5, 2, SS_ANNE_2
-	warp 2, 15, 3, SS_ANNE_2
-	warp 3, 15, 3, SS_ANNE_2
-	warp 12, 15, 4, SS_ANNE_2
-	warp 13, 15, 4, SS_ANNE_2
-	warp 22, 15, 5, SS_ANNE_2
-	warp 23, 15, 5, SS_ANNE_2
-
-	db 0 ; signs
-
-	db 13 ; objects
-	object SPRITE_GENTLEMAN, 10, 2, STAY, RIGHT, 1, OPP_GENTLEMAN, 3
-	object SPRITE_FISHER2, 13, 4, STAY, LEFT, 2, OPP_FISHER, 1
-	object SPRITE_GENTLEMAN, 0, 14, STAY, RIGHT, 3, OPP_GENTLEMAN, 5
-	object SPRITE_LASS, 2, 11, STAY, DOWN, 4, OPP_LASS, 12
-	object SPRITE_GENTLEMAN, 1, 2, STAY, DOWN, 5 ; person
-	object SPRITE_BALL, 12, 1, STAY, NONE, 6, MAX_ETHER
-	object SPRITE_GENTLEMAN, 21, 2, STAY, DOWN, 7 ; person
-	object SPRITE_OLD_PERSON, 22, 1, STAY, DOWN, 8 ; person
-	object SPRITE_BALL, 0, 12, STAY, NONE, 9, RARE_CANDY
-	object SPRITE_GENTLEMAN, 12, 12, STAY, DOWN, 10 ; person
-	object SPRITE_YOUNG_BOY, 11, 14, STAY, NONE, 11 ; person
-	object SPRITE_BRUNETTE_GIRL, 22, 12, STAY, LEFT, 12 ; person
-	object SPRITE_FOULARD_WOMAN, 20, 12, STAY, RIGHT, 13 ; person
-
-	; warp-to
-	warp_to 2, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 3, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 12, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 13, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 22, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 23, 5, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 2, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 3, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 12, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 13, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 22, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2
-	warp_to 23, 15, SS_ANNE_9_WIDTH ; SS_ANNE_2
diff --git a/data/mapObjects/undergroundpathentranceroute5.asm b/data/mapObjects/undergroundpathentranceroute5.asm
deleted file mode 100755
index 3e3d52dd..00000000
--- a/data/mapObjects/undergroundpathentranceroute5.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-UndergroundPathEntranceRoute5Object:
-	db $a ; border block
-
-	db 3 ; warps
-	warp 3, 7, 3, -1
-	warp 4, 7, 3, -1
-	warp 4, 4, 0, UNDERGROUND_PATH_NS
-
-	db 0 ; signs
-
-	db 1 ; objects
-	object SPRITE_LITTLE_GIRL, 2, 3, STAY, NONE, 1 ; person
-
-	; warp-to
-	warp_to 3, 7, PATH_ENTRANCE_ROUTE_5_WIDTH
-	warp_to 4, 7, PATH_ENTRANCE_ROUTE_5_WIDTH
-	warp_to 4, 4, PATH_ENTRANCE_ROUTE_5_WIDTH ; UNDERGROUND_PATH_NS
diff --git a/data/mapObjects/undergroundpathentranceroute6.asm b/data/mapObjects/undergroundpathentranceroute6.asm
deleted file mode 100755
index f9c6d224..00000000
--- a/data/mapObjects/undergroundpathentranceroute6.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-UndergroundPathEntranceRoute6Object:
-	db $a ; border block
-
-	db 3 ; warps
-	warp 3, 7, 3, -1
-	warp 4, 7, 3, -1
-	warp 4, 4, 1, UNDERGROUND_PATH_NS
-
-	db 0 ; signs
-
-	db 1 ; objects
-	object SPRITE_GIRL, 2, 3, STAY, NONE, 1 ; person
-
-	; warp-to
-	warp_to 3, 7, PATH_ENTRANCE_ROUTE_6_WIDTH
-	warp_to 4, 7, PATH_ENTRANCE_ROUTE_6_WIDTH
-	warp_to 4, 4, PATH_ENTRANCE_ROUTE_6_WIDTH ; UNDERGROUND_PATH_NS
diff --git a/data/mapObjects/undergroundpathentranceroute7.asm b/data/mapObjects/undergroundpathentranceroute7.asm
deleted file mode 100755
index 80dde9a3..00000000
--- a/data/mapObjects/undergroundpathentranceroute7.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-UndergroundPathEntranceRoute7Object:
-	db $a ; border block
-
-	db 3 ; warps
-	warp 3, 7, 4, -1
-	warp 4, 7, 4, -1
-	warp 4, 4, 0, UNDERGROUND_PATH_WE
-
-	db 0 ; signs
-
-	db 1 ; objects
-	object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 1 ; person
-
-	; warp-to
-	warp_to 3, 7, PATH_ENTRANCE_ROUTE_7_WIDTH
-	warp_to 4, 7, PATH_ENTRANCE_ROUTE_7_WIDTH
-	warp_to 4, 4, PATH_ENTRANCE_ROUTE_7_WIDTH ; UNDERGROUND_PATH_WE
diff --git a/data/mapObjects/undergroundpathentranceroute7copy.asm b/data/mapObjects/undergroundpathentranceroute7copy.asm
deleted file mode 100755
index 20b74599..00000000
--- a/data/mapObjects/undergroundpathentranceroute7copy.asm
+++ /dev/null
@@ -1,18 +0,0 @@
-UndergroundPathEntranceRoute7CopyObject:
-	db $a ; border block
-
-	db 3 ; warps
-	warp 3, 7, 5, -1
-	warp 4, 7, 5, -1
-	warp 4, 4, 0, UNDERGROUND_PATH_WE
-
-	db 0 ; signs
-
-	db 2 ; objects
-	object SPRITE_GIRL, 3, 2, STAY, NONE, 1 ; person
-	object SPRITE_FAT_BALD_GUY, 2, 4, STAY, NONE, 2 ; person
-
-	; warp-to
-	warp_to 3, 7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH
-	warp_to 4, 7, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH
-	warp_to 4, 4, PATH_ENTRANCE_ROUTE_7_COPY_WIDTH ; UNDERGROUND_PATH_WE
diff --git a/data/mapObjects/undergroundpathentranceroute8.asm b/data/mapObjects/undergroundpathentranceroute8.asm
deleted file mode 100755
index 02390322..00000000
--- a/data/mapObjects/undergroundpathentranceroute8.asm
+++ /dev/null
@@ -1,17 +0,0 @@
-UndergroundPathEntranceRoute8Object:
-	db $a ; border block
-
-	db 3 ; warps
-	warp 3, 7, 4, -1
-	warp 4, 7, 4, -1
-	warp 4, 4, 1, UNDERGROUND_PATH_WE
-
-	db 0 ; signs
-
-	db 1 ; objects
-	object SPRITE_GIRL, 3, 4, STAY, NONE, 1 ; person
-
-	; warp-to
-	warp_to 3, 7, PATH_ENTRANCE_ROUTE_8_WIDTH
-	warp_to 4, 7, PATH_ENTRANCE_ROUTE_8_WIDTH
-	warp_to 4, 4, PATH_ENTRANCE_ROUTE_8_WIDTH ; UNDERGROUND_PATH_WE
diff --git a/data/mapObjects/undergroundpathns.asm b/data/mapObjects/undergroundpathns.asm
deleted file mode 100755
index 00b096e8..00000000
--- a/data/mapObjects/undergroundpathns.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-UndergroundPathNSObject:
-	db $1 ; border block
-
-	db 2 ; warps
-	warp 5, 4, 2, PATH_ENTRANCE_ROUTE_5
-	warp 2, 41, 2, PATH_ENTRANCE_ROUTE_6
-
-	db 0 ; signs
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 5, 4, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_5
-	warp_to 2, 41, UNDERGROUND_PATH_NS_WIDTH ; PATH_ENTRANCE_ROUTE_6
diff --git a/data/mapObjects/undergroundpathwe.asm b/data/mapObjects/undergroundpathwe.asm
deleted file mode 100755
index 0af2ccc3..00000000
--- a/data/mapObjects/undergroundpathwe.asm
+++ /dev/null
@@ -1,14 +0,0 @@
-UndergroundPathWEObject:
-	db $1 ; border block
-
-	db 2 ; warps
-	warp 2, 5, 2, PATH_ENTRANCE_ROUTE_7
-	warp 47, 2, 2, PATH_ENTRANCE_ROUTE_8
-
-	db 0 ; signs
-
-	db 0 ; objects
-
-	; warp-to
-	warp_to 2, 5, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_7
-	warp_to 47, 2, UNDERGROUND_PATH_WE_WIDTH ; PATH_ENTRANCE_ROUTE_8
diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm
deleted file mode 100755
index 97ff99a8..00000000
--- a/data/mapObjects/unknowndungeon1.asm
+++ /dev/null
@@ -1,31 +0,0 @@
-UnknownDungeon1Object:
-	db $7d ; border block
-
-	db 9 ; warps
-	warp 24, 17, 6, -1
-	warp 25, 17, 6, -1
-	warp 27, 1, 0, UNKNOWN_DUNGEON_2
-	warp 23, 7, 1, UNKNOWN_DUNGEON_2
-	warp 18, 9, 2, UNKNOWN_DUNGEON_2
-	warp 7, 1, 3, UNKNOWN_DUNGEON_2
-	warp 1, 3, 4, UNKNOWN_DUNGEON_2
-	warp 3, 11, 5, UNKNOWN_DUNGEON_2
-	warp 0, 6, 0, UNKNOWN_DUNGEON_3
-
-	db 0 ; signs
-
-	db 3 ; objects
-	object SPRITE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE
-	object SPRITE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER
-	object SPRITE_BALL, 5, 0, STAY, NONE, 3, NUGGET
-
-	; warp-to
-	warp_to 24, 17, UNKNOWN_DUNGEON_1_WIDTH
-	warp_to 25, 17, UNKNOWN_DUNGEON_1_WIDTH
-	warp_to 27, 1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2
-	warp_to 23, 7, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2
-	warp_to 18, 9, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2
-	warp_to 7, 1, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2
-	warp_to 1, 3, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2
-	warp_to 3, 11, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_2
-	warp_to 0, 6, UNKNOWN_DUNGEON_1_WIDTH ; UNKNOWN_DUNGEON_3
diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm
deleted file mode 100755
index 51626589..00000000
--- a/data/mapObjects/unknowndungeon2.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-UnknownDungeon2Object:
-	db $7d ; border block
-
-	db 6 ; warps
-	warp 29, 1, 2, UNKNOWN_DUNGEON_1
-	warp 22, 6, 3, UNKNOWN_DUNGEON_1
-	warp 19, 7, 4, UNKNOWN_DUNGEON_1
-	warp 9, 1, 5, UNKNOWN_DUNGEON_1
-	warp 1, 3, 6, UNKNOWN_DUNGEON_1
-	warp 3, 11, 7, UNKNOWN_DUNGEON_1
-
-	db 0 ; signs
-
-	db 3 ; objects
-	object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP
-	object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL
-	object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE
-
-	; warp-to
-	warp_to 29, 1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1
-	warp_to 22, 6, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1
-	warp_to 19, 7, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1
-	warp_to 9, 1, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1
-	warp_to 1, 3, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1
-	warp_to 3, 11, UNKNOWN_DUNGEON_2_WIDTH ; UNKNOWN_DUNGEON_1
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index ab8ae1ca..3dc1988a 100755
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -1,176 +1,176 @@
 ; see also MapHeaderPointers
 MapHeaderBanks:
-	db BANK(PalletTown_h) ;PALLET_TOWN
-	db BANK(ViridianCity_h) ; VIRIDIAN_CITY
-	db BANK(PewterCity_h) ; PEWTER_CITY
-	db BANK(CeruleanCity_h) ; CERULEAN_CITY
-	db BANK(LavenderTown_h) ; LAVENDER_TOWN
-	db BANK(VermilionCity_h) ; VERMILION_CITY
-	db BANK(CeladonCity_h) ; CELADON_CITY
-	db BANK(FuchsiaCity_h) ; FUCHSIA_CITY
-	db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND
-	db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU
-	db BANK(SaffronCity_h) ; SAFFRON_CITY
-	db $1 ; unused
-	db BANK(Route1_h) ; ROUTE_1
-	db BANK(Route2_h) ; ROUTE_2
-	db BANK(Route3_h) ; ROUTE_3
-	db BANK(Route4_h) ; ROUTE_4
-	db BANK(Route5_h) ; ROUTE_5
-	db BANK(Route6_h) ; ROUTE_6
-	db BANK(Route7_h) ; ROUTE_7
-	db BANK(Route8_h) ; ROUTE_8
-	db BANK(Route9_h) ; ROUTE_9
-	db BANK(Route10_h) ; ROUTE_10
-	db BANK(Route11_h) ; ROUTE_11
-	db BANK(Route12_h) ; ROUTE_12
-	db BANK(Route13_h) ; ROUTE_13
-	db BANK(Route14_h) ; ROUTE_14
-	db BANK(Route15_h) ; ROUTE_15
-	db BANK(Route16_h) ; ROUTE_16
-	db BANK(Route17_h) ; ROUTE_17
-	db BANK(Route18_h) ; ROUTE_18
-	db BANK(Route19_h) ; ROUTE_19
-	db BANK(Route20_h) ; ROUTE_20
-	db BANK(Route21_h) ; ROUTE_21
-	db BANK(Route22_h) ; ROUTE_22
-	db BANK(Route23_h) ; ROUTE_23
-	db BANK(Route24_h) ; ROUTE_24
-	db BANK(Route25_h) ; ROUTE_25
+	db BANK(PalletTown_h)
+	db BANK(ViridianCity_h)
+	db BANK(PewterCity_h)
+	db BANK(CeruleanCity_h)
+	db BANK(LavenderTown_h)
+	db BANK(VermilionCity_h)
+	db BANK(CeladonCity_h)
+	db BANK(FuchsiaCity_h)
+	db BANK(CinnabarIsland_h)
+	db BANK(IndigoPlateau_h)
+	db BANK(SaffronCity_h)
+	db $01 ; UNUSED_MAP_0B
+	db BANK(Route1_h)
+	db BANK(Route2_h)
+	db BANK(Route3_h)
+	db BANK(Route4_h)
+	db BANK(Route5_h)
+	db BANK(Route6_h)
+	db BANK(Route7_h)
+	db BANK(Route8_h)
+	db BANK(Route9_h)
+	db BANK(Route10_h)
+	db BANK(Route11_h)
+	db BANK(Route12_h)
+	db BANK(Route13_h)
+	db BANK(Route14_h)
+	db BANK(Route15_h)
+	db BANK(Route16_h)
+	db BANK(Route17_h)
+	db BANK(Route18_h)
+	db BANK(Route19_h)
+	db BANK(Route20_h)
+	db BANK(Route21_h)
+	db BANK(Route22_h)
+	db BANK(Route23_h)
+	db BANK(Route24_h)
+	db BANK(Route25_h)
 	db BANK(RedsHouse1F_h)
 	db BANK(RedsHouse2F_h)
 	db BANK(BluesHouse_h)
 	db BANK(OaksLab_h)
 	db BANK(ViridianPokecenter_h)
 	db BANK(ViridianMart_h)
-	db BANK(School_h)
-	db BANK(ViridianHouse_h)
+	db BANK(ViridianSchoolHouse_h)
+	db BANK(ViridianNicknameHouse_h)
 	db BANK(ViridianGym_h)
 	db BANK(DiglettsCaveRoute2_h)
-	db BANK(ViridianForestExit_h)
-	db BANK(Route2House_h)
+	db BANK(ViridianForestNorthGate_h)
+	db BANK(Route2TradeHouse_h)
 	db BANK(Route2Gate_h)
-	db BANK(ViridianForestEntrance_h)
+	db BANK(ViridianForestSouthGate_h)
 	db BANK(ViridianForest_h)
 	db BANK(Museum1F_h)
 	db BANK(Museum2F_h)
 	db BANK(PewterGym_h)
-	db BANK(PewterHouse1_h)
+	db BANK(PewterNidoranHouse_h)
 	db BANK(PewterMart_h)
-	db BANK(PewterHouse2_h)
+	db BANK(PewterSpeechHouse_h)
 	db BANK(PewterPokecenter_h)
-	db BANK(MtMoon1_h)
-	db BANK(MtMoon2_h)
-	db BANK(MtMoon3_h)
-	db BANK(CeruleanHouseTrashed_h)
-	db BANK(CeruleanHouse1_h)
+	db BANK(MtMoon1F_h)
+	db BANK(MtMoonB1F_h)
+	db BANK(MtMoonB2F_h)
+	db BANK(CeruleanTrashedHouse_h)
+	db BANK(CeruleanTradeHouse_h)
 	db BANK(CeruleanPokecenter_h)
 	db BANK(CeruleanGym_h)
 	db BANK(BikeShop_h)
 	db BANK(CeruleanMart_h)
 	db BANK(MtMoonPokecenter_h)
-	db BANK(CeruleanHouseTrashed_h)
+	db BANK(CeruleanTrashedHouse_h)
 	db BANK(Route5Gate_h)
-	db BANK(UndergroundPathEntranceRoute5_h)
-	db BANK(DayCareM_h)
+	db BANK(UndergroundPathRoute5_h)
+	db BANK(Daycare_h)
 	db BANK(Route6Gate_h)
-	db BANK(UndergroundPathEntranceRoute6_h)
-	db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE
+	db BANK(UndergroundPathRoute6_h)
+	db BANK(UndergroundPathRoute6_h) ; UNDERGROUND_PATH_ROUTE_6_COPY
 	db BANK(Route7Gate_h)
-	db BANK(UndergroundPathEntranceRoute7_h)
-	db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE
+	db BANK(UndergroundPathRoute7_h)
+	db BANK(UndergroundPathRoute7Copy_h)
 	db BANK(Route8Gate_h)
-	db BANK(UndergroundPathEntranceRoute8_h)
+	db BANK(UndergroundPathRoute8_h)
 	db BANK(RockTunnelPokecenter_h)
-	db BANK(RockTunnel1_h)
+	db BANK(RockTunnel1F_h)
 	db BANK(PowerPlant_h)
-	db BANK(Route11Gate_h)
-	db BANK(DiglettsCaveEntranceRoute11_h)
-	db BANK(Route11GateUpstairs_h)
-	db BANK(Route12Gate_h)
+	db BANK(Route11Gate1F_h)
+	db BANK(DiglettsCaveRoute11_h)
+	db BANK(Route11Gate2F_h)
+	db BANK(Route12Gate1F_h)
 	db BANK(BillsHouse_h)
 	db BANK(VermilionPokecenter_h)
-	db BANK(FanClub_h)
+	db BANK(PokemonFanClub_h)
 	db BANK(VermilionMart_h)
 	db BANK(VermilionGym_h)
-	db BANK(VermilionHouse1_h)
+	db BANK(VermilionPidgeyHouse_h)
 	db BANK(VermilionDock_h)
-	db BANK(SSAnne1_h)
-	db BANK(SSAnne2_h)
-	db BANK(SSAnne3_h)
-	db BANK(SSAnne4_h)
-	db BANK(SSAnne5_h)
-	db BANK(SSAnne6_h)
-	db BANK(SSAnne7_h)
-	db BANK(SSAnne8_h)
-	db BANK(SSAnne9_h)
-	db BANK(SSAnne10_h)
-	db $1D ;unused
-	db $1D ;unused
-	db $1D ;unused
-	db BANK(VictoryRoad1_h)
-	db $1D ;unused
-	db $1D ;unused
-	db $1D ;unused
-	db $1D ;unused
-	db BANK(Lance_h)
-	db $1D ;unused
-	db $1D ;unused
-	db $1D ;unused
-	db $1D ;unused
-	db BANK(HallofFameRoom_h)
-	db BANK(UndergroundPathNS_h)
-	db BANK(Gary_h)
-	db BANK(UndergroundPathWE_h)
-	db BANK(CeladonMart1_h)
-	db BANK(CeladonMart2_h)
-	db BANK(CeladonMart3_h)
-	db BANK(CeladonMart4_h)
+	db BANK(SSAnne1F_h)
+	db BANK(SSAnne2F_h)
+	db BANK(SSAnne3F_h)
+	db BANK(SSAnneB1F_h)
+	db BANK(SSAnneBow_h)
+	db BANK(SSAnneKitchen_h)
+	db BANK(SSAnneCaptainsRoom_h)
+	db BANK(SSAnne1FRooms_h)
+	db BANK(SSAnne2FRooms_h)
+	db BANK(SSAnneB1FRooms_h)
+	db $1D ; UNUSED_MAP_69
+	db $1D ; UNUSED_MAP_6A
+	db $1D ; UNUSED_MAP_6B
+	db BANK(VictoryRoad1F_h)
+	db $1D ; UNUSED_MAP_6D
+	db $1D ; UNUSED_MAP_6E
+	db $1D ; UNUSED_MAP_6F
+	db $1D ; UNUSED_MAP_70
+	db BANK(LancesRoom_h)
+	db $1D ; UNUSED_MAP_72
+	db $1D ; UNUSED_MAP_73
+	db $1D ; UNUSED_MAP_74
+	db $1D ; UNUSED_MAP_75
+	db BANK(HallOfFame_h)
+	db BANK(UndergroundPathNorthSouth_h)
+	db BANK(ChampionsRoom_h)
+	db BANK(UndergroundPathWestEast_h)
+	db BANK(CeladonMart1F_h)
+	db BANK(CeladonMart2F_h)
+	db BANK(CeladonMart3F_h)
+	db BANK(CeladonMart4F_h)
 	db BANK(CeladonMartRoof_h)
 	db BANK(CeladonMartElevator_h)
-	db BANK(CeladonMansion1_h)
-	db BANK(CeladonMansion2_h)
-	db BANK(CeladonMansion3_h)
-	db BANK(CeladonMansion4_h)
-	db BANK(CeladonMansion5_h)
+	db BANK(CeladonMansion1F_h)
+	db BANK(CeladonMansion2F_h)
+	db BANK(CeladonMansion3F_h)
+	db BANK(CeladonMansionRoof_h)
+	db BANK(CeladonMansionRoofHouse_h)
 	db BANK(CeladonPokecenter_h)
 	db BANK(CeladonGym_h)
-	db BANK(CeladonGameCorner_h)
-	db BANK(CeladonMart5_h)
-	db BANK(CeladonPrizeRoom_h)
+	db BANK(GameCorner_h)
+	db BANK(CeladonMart5F_h)
+	db BANK(GameCornerPrizeRoom_h)
 	db BANK(CeladonDiner_h)
-	db BANK(CeladonHouse_h)
+	db BANK(CeladonChiefHouse_h)
 	db BANK(CeladonHotel_h)
 	db BANK(LavenderPokecenter_h)
-	db BANK(PokemonTower1_h)
-	db BANK(PokemonTower2_h)
-	db BANK(PokemonTower3_h)
-	db BANK(PokemonTower4_h)
-	db BANK(PokemonTower5_h)
-	db BANK(PokemonTower6_h)
-	db BANK(PokemonTower7_h)
-	db BANK(LavenderHouse1_h)
+	db BANK(PokemonTower1F_h)
+	db BANK(PokemonTower2F_h)
+	db BANK(PokemonTower3F_h)
+	db BANK(PokemonTower4F_h)
+	db BANK(PokemonTower5F_h)
+	db BANK(PokemonTower6F_h)
+	db BANK(PokemonTower7F_h)
+	db BANK(MrFujisHouse_h)
 	db BANK(LavenderMart_h)
-	db BANK(LavenderHouse2_h)
+	db BANK(LavenderCuboneHouse_h)
 	db BANK(FuchsiaMart_h)
-	db BANK(FuchsiaHouse1_h)
+	db BANK(FuchsiaBillsGrandpasHouse_h)
 	db BANK(FuchsiaPokecenter_h)
-	db BANK(FuchsiaHouse2_h)
-	db BANK(SafariZoneEntrance_h)
+	db BANK(WardensHouse_h)
+	db BANK(SafariZoneGate_h)
 	db BANK(FuchsiaGym_h)
 	db BANK(FuchsiaMeetingRoom_h)
-	db BANK(SeafoamIslands2_h)
-	db BANK(SeafoamIslands3_h)
-	db BANK(SeafoamIslands4_h)
-	db BANK(SeafoamIslands5_h)
-	db BANK(VermilionHouse2_h)
-	db BANK(FuchsiaHouse3_h)
-	db BANK(Mansion1_h)
+	db BANK(SeafoamIslandsB1F_h)
+	db BANK(SeafoamIslandsB2F_h)
+	db BANK(SeafoamIslandsB3F_h)
+	db BANK(SeafoamIslandsB4F_h)
+	db BANK(VermilionOldRodHouse_h)
+	db BANK(FuchsiaGoodRodHouse_h)
+	db BANK(PokemonMansion1F_h)
 	db BANK(CinnabarGym_h)
-	db BANK(Lab1_h)
-	db BANK(Lab2_h)
-	db BANK(Lab3_h)
-	db BANK(Lab4_h)
+	db BANK(CinnabarLab_h)
+	db BANK(CinnabarLabTradeRoom_h)
+	db BANK(CinnabarLabMetronomeRoom_h)
+	db BANK(CinnabarLabFossilRoom_h)
 	db BANK(CinnabarPokecenter_h)
 	db BANK(CinnabarMart_h)
 	db BANK(CinnabarMart_h)
@@ -179,72 +179,72 @@ MapHeaderBanks:
 	db BANK(CopycatsHouse2F_h)
 	db BANK(FightingDojo_h)
 	db BANK(SaffronGym_h)
-	db BANK(SaffronHouse1_h)
+	db BANK(SaffronPidgeyHouse_h)
 	db BANK(SaffronMart_h)
-	db BANK(SilphCo1_h)
+	db BANK(SilphCo1F_h)
 	db BANK(SaffronPokecenter_h)
-	db BANK(SaffronHouse2_h)
-	db BANK(Route15Gate_h)
-	db BANK(Route15GateUpstairs_h)
-	db BANK(Route16Gate_h)
-	db BANK(Route16GateUpstairs_h)
-	db BANK(Route16House_h)
-	db BANK(Route12House_h)
-	db BANK(Route18Gate_h)
-	db BANK(Route18GateUpstairs_h)
-	db BANK(SeafoamIslands1_h)
+	db BANK(MrPsychicsHouse_h)
+	db BANK(Route15Gate1F_h)
+	db BANK(Route15Gate2F_h)
+	db BANK(Route16Gate1F_h)
+	db BANK(Route16Gate2F_h)
+	db BANK(Route16FlyHouse_h)
+	db BANK(Route12SuperRodHouse_h)
+	db BANK(Route18Gate1F_h)
+	db BANK(Route18Gate2F_h)
+	db BANK(SeafoamIslands1F_h)
 	db BANK(Route22Gate_h)
-	db BANK(VictoryRoad2_h)
-	db BANK(Route12GateUpstairs_h)
-	db BANK(VermilionHouse3_h)
+	db BANK(VictoryRoad2F_h)
+	db BANK(Route12Gate2F_h)
+	db BANK(VermilionTradeHouse_h)
 	db BANK(DiglettsCave_h)
-	db BANK(VictoryRoad3_h)
-	db BANK(RocketHideout1_h)
-	db BANK(RocketHideout2_h)
-	db BANK(RocketHideout3_h)
-	db BANK(RocketHideout4_h)
+	db BANK(VictoryRoad3F_h)
+	db BANK(RocketHideoutB1F_h)
+	db BANK(RocketHideoutB2F_h)
+	db BANK(RocketHideoutB3F_h)
+	db BANK(RocketHideoutB4F_h)
 	db BANK(RocketHideoutElevator_h)
-	db $01
-	db $01
-	db $01
-	db BANK(SilphCo2_h)
-	db BANK(SilphCo3_h)
-	db BANK(SilphCo4_h)
-	db BANK(SilphCo5_h)
-	db BANK(SilphCo6_h)
-	db BANK(SilphCo7_h)
-	db BANK(SilphCo8_h)
-	db BANK(Mansion2_h)
-	db BANK(Mansion3_h)
-	db BANK(Mansion4_h)
+	db $01 ; UNUSED_MAP_CC
+	db $01 ; UNUSED_MAP_CD
+	db $01 ; UNUSED_MAP_CE
+	db BANK(SilphCo2F_h)
+	db BANK(SilphCo3F_h)
+	db BANK(SilphCo4F_h)
+	db BANK(SilphCo5F_h)
+	db BANK(SilphCo6F_h)
+	db BANK(SilphCo7F_h)
+	db BANK(SilphCo8F_h)
+	db BANK(PokemonMansion2F_h)
+	db BANK(PokemonMansion3F_h)
+	db BANK(PokemonMansionB1F_h)
 	db BANK(SafariZoneEast_h)
 	db BANK(SafariZoneNorth_h)
 	db BANK(SafariZoneWest_h)
 	db BANK(SafariZoneCenter_h)
-	db BANK(SafariZoneRestHouse1_h)
+	db BANK(SafariZoneCenterRestHouse_h)
 	db BANK(SafariZoneSecretHouse_h)
-	db BANK(SafariZoneRestHouse2_h)
-	db BANK(SafariZoneRestHouse3_h)
-	db BANK(SafariZoneRestHouse4_h)
-	db BANK(UnknownDungeon2_h)
-	db BANK(UnknownDungeon3_h)
-	db BANK(UnknownDungeon1_h)
-	db BANK(NameRater_h)
-	db BANK(CeruleanHouse2_h)
-	db $01
-	db BANK(RockTunnel2_h)
-	db BANK(SilphCo9_h)
-	db BANK(SilphCo10_h)
-	db BANK(SilphCo11_h)
+	db BANK(SafariZoneWestRestHouse_h)
+	db BANK(SafariZoneEastRestHouse_h)
+	db BANK(SafariZoneNorthRestHouse_h)
+	db BANK(CeruleanCave2F_h)
+	db BANK(CeruleanCaveB1F_h)
+	db BANK(CeruleanCave1F_h)
+	db BANK(NameRatersHouse_h)
+	db BANK(CeruleanBadgeHouse_h)
+	db $01 ; UNUSED_MAP_E7
+	db BANK(RockTunnelB1F_h)
+	db BANK(SilphCo9F_h)
+	db BANK(SilphCo10F_h)
+	db BANK(SilphCo11F_h)
 	db BANK(SilphCoElevator_h)
-	db $11
-	db $11
+	db $11 ; UNUSED_MAP_ED
+	db $11 ; UNUSED_MAP_EE
 	db BANK(TradeCenter_h)
 	db BANK(Colosseum_h)
-	db $11
-	db $11
-	db $11
-	db $11
-	db BANK(Lorelei_h)
-	db BANK(Bruno_h)
-	db BANK(Agatha_h)
+	db $11 ; UNUSED_MAP_F1
+	db $11 ; UNUSED_MAP_F2
+	db $11 ; UNUSED_MAP_F3
+	db $11 ; UNUSED_MAP_F4
+	db BANK(LoreleisRoom_h)
+	db BANK(BrunosRoom_h)
+	db BANK(AgathasRoom_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index b777e4ca..9d85eaae 100755
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -11,7 +11,7 @@ MapHeaderPointers::
 	dw CinnabarIsland_h
 	dw IndigoPlateau_h
 	dw SaffronCity_h
-	dw SaffronCity_h
+	dw SaffronCity_h ; UNUSED_MAP_0B
 	dw Route1_h
 	dw Route2_h
 	dw Route3_h
@@ -40,211 +40,211 @@ MapHeaderPointers::
 	dw RedsHouse1F_h
 	dw RedsHouse2F_h
 	dw BluesHouse_h
-	dw OaksLab_h ;id=40
+	dw OaksLab_h
 	dw ViridianPokecenter_h
 	dw ViridianMart_h
-	dw School_h
-	dw ViridianHouse_h
+	dw ViridianSchoolHouse_h
+	dw ViridianNicknameHouse_h
 	dw ViridianGym_h
 	dw DiglettsCaveRoute2_h
-	dw ViridianForestExit_h
-	dw Route2House_h
+	dw ViridianForestNorthGate_h
+	dw Route2TradeHouse_h
 	dw Route2Gate_h
-	dw ViridianForestEntrance_h ;id=50
+	dw ViridianForestSouthGate_h
 	dw ViridianForest_h
 	dw Museum1F_h
 	dw Museum2F_h
 	dw PewterGym_h
-	dw PewterHouse1_h
+	dw PewterNidoranHouse_h
 	dw PewterMart_h
-	dw PewterHouse2_h
+	dw PewterSpeechHouse_h
 	dw PewterPokecenter_h
-	dw MtMoon1_h
-	dw MtMoon2_h ;id=60
-	dw MtMoon3_h
-	dw CeruleanHouseTrashed_h
-	dw CeruleanHouse1_h
+	dw MtMoon1F_h
+	dw MtMoonB1F_h
+	dw MtMoonB2F_h
+	dw CeruleanTrashedHouse_h
+	dw CeruleanTradeHouse_h
 	dw CeruleanPokecenter_h
 	dw CeruleanGym_h
 	dw BikeShop_h
 	dw CeruleanMart_h
 	dw MtMoonPokecenter_h
-	dw CeruleanHouseTrashed_h ; copy
+	dw CeruleanTrashedHouse_h ; CERULEAN_TRASHED_HOUSE_COPY
 	dw Route5Gate_h
-	dw UndergroundPathEntranceRoute5_h
-	dw DayCareM_h
+	dw UndergroundPathRoute5_h
+	dw Daycare_h
 	dw Route6Gate_h
-	dw UndergroundPathEntranceRoute6_h
-	dw UndergroundPathEntranceRoute6_h ; unused
+	dw UndergroundPathRoute6_h
+	dw UndergroundPathRoute6_h ; UNDERGROUND_PATH_ROUTE_6_COPY
 	dw Route7Gate_h
-	dw UndergroundPathEntranceRoute7_h
-	dw UndergroundPathEntranceRoute7Copy_h
+	dw UndergroundPathRoute7_h
+	dw UndergroundPathRoute7Copy_h
 	dw Route8Gate_h
-	dw UndergroundPathEntranceRoute8_h ;id=80
+	dw UndergroundPathRoute8_h
 	dw RockTunnelPokecenter_h
-	dw RockTunnel1_h
+	dw RockTunnel1F_h
 	dw PowerPlant_h
-	dw Route11Gate_h
-	dw DiglettsCaveEntranceRoute11_h
-	dw Route11GateUpstairs_h
-	dw Route12Gate_h
+	dw Route11Gate1F_h
+	dw DiglettsCaveRoute11_h
+	dw Route11Gate2F_h
+	dw Route12Gate1F_h
 	dw BillsHouse_h
 	dw VermilionPokecenter_h
-	dw FanClub_h ;id=90
+	dw PokemonFanClub_h
 	dw VermilionMart_h
 	dw VermilionGym_h
-	dw VermilionHouse1_h
+	dw VermilionPidgeyHouse_h
 	dw VermilionDock_h
-	dw SSAnne1_h
-	dw SSAnne2_h
-	dw SSAnne3_h
-	dw SSAnne4_h
-	dw SSAnne5_h
-	dw SSAnne6_h ;id=100
-	dw SSAnne7_h
-	dw SSAnne8_h
-	dw SSAnne9_h
-	dw SSAnne10_h
-	dw Lance_h ; unused
-	dw Lance_h ; unused
-	dw Lance_h ; unused
-	dw VictoryRoad1_h
-	dw Lance_h ; unused
-	dw Lance_h ; unused ;id=110
-	dw Lance_h ; unused
-	dw Lance_h ; unused
-	dw Lance_h
-	dw Lance_h ; unused
-	dw Lance_h ; unused
-	dw Lance_h ; unused
-	dw Lance_h ; unused
-	dw HallofFameRoom_h
-	dw UndergroundPathNS_h
-	dw Gary_h ;id=120
-	dw UndergroundPathWE_h
-	dw CeladonMart1_h
-	dw CeladonMart2_h
-	dw CeladonMart3_h
-	dw CeladonMart4_h
+	dw SSAnne1F_h
+	dw SSAnne2F_h
+	dw SSAnne3F_h
+	dw SSAnneB1F_h
+	dw SSAnneBow_h
+	dw SSAnneKitchen_h
+	dw SSAnneCaptainsRoom_h
+	dw SSAnne1FRooms_h
+	dw SSAnne2FRooms_h
+	dw SSAnneB1FRooms_h
+	dw LancesRoom_h ; UNUSED_MAP_69
+	dw LancesRoom_h ; UNUSED_MAP_6A
+	dw LancesRoom_h ; UNUSED_MAP_6B
+	dw VictoryRoad1F_h
+	dw LancesRoom_h ; UNUSED_MAP_6D
+	dw LancesRoom_h ; UNUSED_MAP_6E
+	dw LancesRoom_h ; UNUSED_MAP_6F
+	dw LancesRoom_h ; UNUSED_MAP_70
+	dw LancesRoom_h
+	dw LancesRoom_h ; UNUSED_MAP_72
+	dw LancesRoom_h ; UNUSED_MAP_73
+	dw LancesRoom_h ; UNUSED_MAP_74
+	dw LancesRoom_h ; UNUSED_MAP_75
+	dw HallOfFame_h
+	dw UndergroundPathNorthSouth_h
+	dw ChampionsRoom_h
+	dw UndergroundPathWestEast_h
+	dw CeladonMart1F_h
+	dw CeladonMart2F_h
+	dw CeladonMart3F_h
+	dw CeladonMart4F_h
 	dw CeladonMartRoof_h
 	dw CeladonMartElevator_h
-	dw CeladonMansion1_h
-	dw CeladonMansion2_h
-	dw CeladonMansion3_h ;id=130
-	dw CeladonMansion4_h
-	dw CeladonMansion5_h
+	dw CeladonMansion1F_h
+	dw CeladonMansion2F_h
+	dw CeladonMansion3F_h
+	dw CeladonMansionRoof_h
+	dw CeladonMansionRoofHouse_h
 	dw CeladonPokecenter_h
 	dw CeladonGym_h
-	dw CeladonGameCorner_h
-	dw CeladonMart5_h
-	dw CeladonPrizeRoom_h
+	dw GameCorner_h
+	dw CeladonMart5F_h
+	dw GameCornerPrizeRoom_h
 	dw CeladonDiner_h
-	dw CeladonHouse_h
-	dw CeladonHotel_h ;id=140
+	dw CeladonChiefHouse_h
+	dw CeladonHotel_h
 	dw LavenderPokecenter_h
-	dw PokemonTower1_h
-	dw PokemonTower2_h
-	dw PokemonTower3_h
-	dw PokemonTower4_h
-	dw PokemonTower5_h
-	dw PokemonTower6_h
-	dw PokemonTower7_h
-	dw LavenderHouse1_h
-	dw LavenderMart_h ;id=150
-	dw LavenderHouse2_h
+	dw PokemonTower1F_h
+	dw PokemonTower2F_h
+	dw PokemonTower3F_h
+	dw PokemonTower4F_h
+	dw PokemonTower5F_h
+	dw PokemonTower6F_h
+	dw PokemonTower7F_h
+	dw MrFujisHouse_h
+	dw LavenderMart_h
+	dw LavenderCuboneHouse_h
 	dw FuchsiaMart_h
-	dw FuchsiaHouse1_h
+	dw FuchsiaBillsGrandpasHouse_h
 	dw FuchsiaPokecenter_h
-	dw FuchsiaHouse2_h
-	dw SafariZoneEntrance_h
+	dw WardensHouse_h
+	dw SafariZoneGate_h
 	dw FuchsiaGym_h
 	dw FuchsiaMeetingRoom_h
-	dw SeafoamIslands2_h
-	dw SeafoamIslands3_h ;id=160
-	dw SeafoamIslands4_h
-	dw SeafoamIslands5_h
-	dw VermilionHouse2_h
-	dw FuchsiaHouse3_h
-	dw Mansion1_h
+	dw SeafoamIslandsB1F_h
+	dw SeafoamIslandsB2F_h
+	dw SeafoamIslandsB3F_h
+	dw SeafoamIslandsB4F_h
+	dw VermilionOldRodHouse_h
+	dw FuchsiaGoodRodHouse_h
+	dw PokemonMansion1F_h
 	dw CinnabarGym_h
-	dw Lab1_h
-	dw Lab2_h
-	dw Lab3_h
-	dw Lab4_h ;id=170
+	dw CinnabarLab_h
+	dw CinnabarLabTradeRoom_h
+	dw CinnabarLabMetronomeRoom_h
+	dw CinnabarLabFossilRoom_h
 	dw CinnabarPokecenter_h
 	dw CinnabarMart_h
-	dw CinnabarMart_h ; unused
+	dw CinnabarMart_h ; CINNABAR_MART_COPY
 	dw IndigoPlateauLobby_h
 	dw CopycatsHouse1F_h
 	dw CopycatsHouse2F_h
 	dw FightingDojo_h
 	dw SaffronGym_h
-	dw SaffronHouse1_h
-	dw SaffronMart_h ;id=180
-	dw SilphCo1_h
+	dw SaffronPidgeyHouse_h
+	dw SaffronMart_h
+	dw SilphCo1F_h
 	dw SaffronPokecenter_h
-	dw SaffronHouse2_h
-	dw Route15Gate_h
-	dw Route15GateUpstairs_h
-	dw Route16Gate_h
-	dw Route16GateUpstairs_h
-	dw Route16House_h
-	dw Route12House_h
-	dw Route18Gate_h ;id=190
-	dw Route18GateUpstairs_h
-	dw SeafoamIslands1_h
+	dw MrPsychicsHouse_h
+	dw Route15Gate1F_h
+	dw Route15Gate2F_h
+	dw Route16Gate1F_h
+	dw Route16Gate2F_h
+	dw Route16FlyHouse_h
+	dw Route12SuperRodHouse_h
+	dw Route18Gate1F_h
+	dw Route18Gate2F_h
+	dw SeafoamIslands1F_h
 	dw Route22Gate_h
-	dw VictoryRoad2_h
-	dw Route12GateUpstairs_h
-	dw VermilionHouse3_h
+	dw VictoryRoad2F_h
+	dw Route12Gate2F_h
+	dw VermilionTradeHouse_h
 	dw DiglettsCave_h
-	dw VictoryRoad3_h
-	dw RocketHideout1_h
-	dw RocketHideout2_h ;200
-	dw RocketHideout3_h
-	dw RocketHideout4_h
+	dw VictoryRoad3F_h
+	dw RocketHideoutB1F_h
+	dw RocketHideoutB2F_h
+	dw RocketHideoutB3F_h
+	dw RocketHideoutB4F_h
 	dw RocketHideoutElevator_h
-	dw RocketHideoutElevator_h ; unused
-	dw RocketHideoutElevator_h ; unused
-	dw RocketHideoutElevator_h ; unused
-	dw SilphCo2_h
-	dw SilphCo3_h
-	dw SilphCo4_h
-	dw SilphCo5_h ;210
-	dw SilphCo6_h
-	dw SilphCo7_h
-	dw SilphCo8_h
-	dw Mansion2_h
-	dw Mansion3_h
-	dw Mansion4_h
+	dw RocketHideoutElevator_h ; UNUSED_MAP_CC
+	dw RocketHideoutElevator_h ; UNUSED_MAP_CD
+	dw RocketHideoutElevator_h ; UNUSED_MAP_CE
+	dw SilphCo2F_h
+	dw SilphCo3F_h
+	dw SilphCo4F_h
+	dw SilphCo5F_h
+	dw SilphCo6F_h
+	dw SilphCo7F_h
+	dw SilphCo8F_h
+	dw PokemonMansion2F_h
+	dw PokemonMansion3F_h
+	dw PokemonMansionB1F_h
 	dw SafariZoneEast_h
 	dw SafariZoneNorth_h
 	dw SafariZoneWest_h
-	dw SafariZoneCenter_h ;220
-	dw SafariZoneRestHouse1_h
+	dw SafariZoneCenter_h
+	dw SafariZoneCenterRestHouse_h
 	dw SafariZoneSecretHouse_h
-	dw SafariZoneRestHouse2_h
-	dw SafariZoneRestHouse3_h
-	dw SafariZoneRestHouse4_h
-	dw UnknownDungeon2_h
-	dw UnknownDungeon3_h
-	dw UnknownDungeon1_h
-	dw NameRater_h
-	dw CeruleanHouse2_h
-	dw Route16Gate_h ; unused
-	dw RockTunnel2_h
-	dw SilphCo9_h
-	dw SilphCo10_h
-	dw SilphCo11_h
+	dw SafariZoneWestRestHouse_h
+	dw SafariZoneEastRestHouse_h
+	dw SafariZoneNorthRestHouse_h
+	dw CeruleanCave2F_h
+	dw CeruleanCaveB1F_h
+	dw CeruleanCave1F_h
+	dw NameRatersHouse_h
+	dw CeruleanBadgeHouse_h
+	dw Route16Gate1F_h ; UNUSED_MAP_E7
+	dw RockTunnelB1F_h
+	dw SilphCo9F_h
+	dw SilphCo10F_h
+	dw SilphCo11F_h
 	dw SilphCoElevator_h
-	dw SilphCo2_h ; unused
-	dw SilphCo2_h ; unused
+	dw SilphCo2F_h ; UNUSED_MAP_ED
+	dw SilphCo2F_h ; UNUSED_MAP_EE
 	dw TradeCenter_h
 	dw Colosseum_h
-	dw SilphCo2_h ; unused
-	dw SilphCo2_h ; unused
-	dw SilphCo2_h ; unused
-	dw SilphCo2_h ; unused
-	dw Lorelei_h
-	dw Bruno_h
-	dw Agatha_h ;247
+	dw SilphCo2F_h ; UNUSED_MAP_F1
+	dw SilphCo2F_h ; UNUSED_MAP_F2
+	dw SilphCo2F_h ; UNUSED_MAP_F3
+	dw SilphCo2F_h ; UNUSED_MAP_F4
+	dw LoreleisRoom_h
+	dw BrunosRoom_h
+	dw AgathasRoom_h ;247
diff --git a/data/map_songs.asm b/data/map_songs.asm
index 892f475e..55ec5abf 100755
--- a/data/map_songs.asm
+++ b/data/map_songs.asm
@@ -1,5 +1,5 @@
 MapSongBanks:
-	db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ;PALLET_TOWN
+	db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; PALLET_TOWN
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY
 	db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_CITY
@@ -10,7 +10,7 @@ MapSongBanks:
 	db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_ISLAND
 	db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_CITY
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; unused
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; UNUSED_MAP_0B
 	db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_1
 	db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_2
 	db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_3
@@ -36,214 +36,214 @@ MapSongBanks:
 	db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; ROUTE_23
 	db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_24
 	db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_25
-	db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; RedsHouse1F
-	db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; RedsHouse2F
-	db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; BluesHouse
-	db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; OaksLab
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ViridianPokecenter
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ViridianMart
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; School
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianHouse
-	db MUSIC_GYM, BANK(Music_Gym) ; ViridianGym
-	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveRoute2
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestExit
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2House
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2Gate
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestEntrance
-	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; ViridianForest
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum1F
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum2F
-	db MUSIC_GYM, BANK(Music_Gym) ; PewterGym
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse1
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterMart
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse2
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterPokecenter
-	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon1
-	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon2
-	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon3
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouseTrashed
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouse1
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanPokecenter
-	db MUSIC_GYM, BANK(Music_Gym) ; CeruleanGym
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; BikeShop
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanMart
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; MtMoonPokecenter
-	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; CeruleanHouseTrashed
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route5Gate
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute5
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; DayCareM
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route6Gate
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute6
-	db MUSIC_VERMILION, BANK(Music_Vermilion) ; FREEZE
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route7Gate
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundPathEntranceRoute7
-	db MUSIC_CELADON, BANK(Music_Celadon) ;FREEZE
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route8Gate
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundPathEntranceRoute8
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; RockTunnelPokecenter
-	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; RockTunnel1
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; PowerPlant
-	db MUSIC_VERMILION, BANK(Music_Vermilion) ; Route11Gate
-	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveEntranceRoute11
-	db MUSIC_VERMILION, BANK(Music_Vermilion) ; Route11GateUpstairs
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route12Gate
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; BillsHouse
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VermilionPokecenter
-	db MUSIC_VERMILION, BANK(Music_Vermilion) ; FanClub
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VermilionMart
-	db MUSIC_GYM, BANK(Music_Gym) ; VermilionGym
-	db MUSIC_VERMILION, BANK(Music_Vermilion) ; VermilionHouse1
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; VermilionDock
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne1
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne2
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne3
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne4
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne5
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne6
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne7
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne8
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne9
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne10
-	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ;unused
-	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ;unused
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused
-	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad1
-	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ;unused
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ;unused
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ;unused
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ;unused
-	db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; Lance
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused
-	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused
-	db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HallofFameRoom
-	db MUSIC_ROUTES1, BANK(Music_Routes1) ; UndergroundPathNS
-	db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; Gary
-	db MUSIC_ROUTES1, BANK(Music_Routes1) ; UndergroundPathWE
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart1
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart2
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart3
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart4
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMartRoof
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMartElevator
-	db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion1
-	db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion2
-	db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion3
-	db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion4
-	db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion5
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonPokecenter
-	db MUSIC_GYM, BANK(Music_Gym) ; CeladonGym
-	db MUSIC_GAME_CORNER, BANK(Music_GameCorner) ; CeladonGameCorner
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart5
-	db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonPrizeRoom
-	db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonDiner
-	db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonHouse
-	db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonHotel
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LavenderPokecenter
-	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower1
-	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower2
-	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower3
-	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower4
-	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower5
-	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower6
-	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower7
-	db MUSIC_LAVENDER, BANK(Music_Lavender) ; LavenderHouse1
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LavenderMart
-	db MUSIC_LAVENDER, BANK(Music_Lavender) ; LavenderHouse2
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FuchsiaMart
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse1
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FuchsiaPokecenter
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse2
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; SafariZoneEntrance
-	db MUSIC_GYM, BANK(Music_Gym) ; FuchsiaGym
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaMeetingRoom
-	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands2
-	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands3
-	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands4
-	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands5
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; VermilionHouse2
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse3
-	db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion1
-	db MUSIC_GYM, BANK(Music_Gym) ; CinnabarGym
-	db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab1
-	db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab2
-	db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab3
-	db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab4
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarPokecenter
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarMart
-	db MUSIC_CINNABAR, BANK(Music_Cinnabar)
-	db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; IndigoPlateauLobby
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse1F
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse2F
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; FightingDojo
-	db MUSIC_GYM, BANK(Music_Gym) ; SaffronGym
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse1
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SaffronMart
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo1
-	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SaffronPokecenter
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse2
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15Gate
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15GateUpstairs
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16Gate
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16GateUpstairs
-	db MUSIC_CELADON, BANK(Music_Celadon) ; Route16House
-	db MUSIC_CELADON, BANK(Music_Celadon) ; Route12House
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route18Gate
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route18GateUpstairs
-	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands1
-	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; Route22Gate
-	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad2
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route12GateUpstairs
-	db MUSIC_VERMILION, BANK(Music_Vermilion) ; VermilionHouse3
-	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCave
-	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad3
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout1
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout2
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout3
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout4
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideoutElevator
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1)
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1)
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1)
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo2
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo3
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo4
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo5
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo6
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo7
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo8
-	db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion2
-	db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion3
-	db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion4
-	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneEast
-	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneNorth
-	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneWest
-	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneCenter
-	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse1
-	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneSecretHouse
-	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse2
-	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse3
-	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse4
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon2
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon3
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon1
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; NameRater
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; CeruleanHouse2
-	db MUSIC_CINNABAR, BANK(Music_Cinnabar)
-	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; RockTunnel2
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo9
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo10
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo11
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCoElevator
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo)
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo)
-	db MUSIC_CELADON, BANK(Music_Celadon) ; TradeCenter
-	db MUSIC_CELADON, BANK(Music_Celadon) ; Colosseum
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo)
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo)
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo)
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo)
-	db MUSIC_GYM, BANK(Music_Gym) ; Lorelei
-	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno
-	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha
+	db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; REDS_HOUSE_1F
+	db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; REDS_HOUSE_2F
+	db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; BLUES_HOUSE
+	db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; OAKS_LAB
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VIRIDIAN_POKECENTER
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VIRIDIAN_MART
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_SCHOOL_HOUSE
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_NICKNAME_HOUSE
+	db MUSIC_GYM, BANK(Music_Gym) ; VIRIDIAN_GYM
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE_ROUTE_2
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_FOREST_NORTH_GATE
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_2_TRADE_HOUSE
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_2_GATE
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_FOREST_SOUTH_GATE
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; VIRIDIAN_FOREST
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; MUSEUM_1F
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; MUSEUM_2F
+	db MUSIC_GYM, BANK(Music_Gym) ; PEWTER_GYM
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_NIDORAN_HOUSE
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PEWTER_MART
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_SPEECH_HOUSE
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PEWTER_POKECENTER
+	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_1F
+	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B1F
+	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B2F
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRASHED_HOUSE
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRADE_HOUSE
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_POKECENTER
+	db MUSIC_GYM, BANK(Music_Gym) ; CERULEAN_GYM
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; BIKE_SHOP
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_MART
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; MT_MOON_POKECENTER
+	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; CERULEAN_TRASHED_HOUSE_COPY
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_5_GATE
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_5
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; DAYCARE
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_6_GATE
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_6
+	db MUSIC_VERMILION, BANK(Music_Vermilion) ; UNDERGROUND_PATH_ROUTE_6_COPY
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_7_GATE
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_7
+	db MUSIC_CELADON, BANK(Music_Celadon) ; UNDERGROUND_PATH_ROUTE_7_COPY
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_8_GATE
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; UNDERGROUND_PATH_ROUTE_8
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ROCK_TUNNEL_POKECENTER
+	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; ROCK_TUNNEL_1F
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; POWER_PLANT
+	db MUSIC_VERMILION, BANK(Music_Vermilion) ; ROUTE_11_GATE_1F
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE_ROUTE_11
+	db MUSIC_VERMILION, BANK(Music_Vermilion) ; ROUTE_11_GATE_2F
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_12_GATE_1F
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; BILLS_HOUSE
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VERMILION_POKECENTER
+	db MUSIC_VERMILION, BANK(Music_Vermilion) ; POKEMON_FAN_CLUB
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VERMILION_MART
+	db MUSIC_GYM, BANK(Music_Gym) ; VERMILION_GYM
+	db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_PIDGEY_HOUSE
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; VERMILION_DOCK
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_1F
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_2F
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_3F
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_B1F
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_BOW
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_KITCHEN
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_CAPTAINS_ROOM
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_1F_ROOMS
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_2F_ROOMS
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SS_ANNE_B1F_ROOMS
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_69
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_6A
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_6B
+	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_1F
+	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; UNUSED_MAP_6D
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_6E
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_6F
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_70
+	db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; LANCES_ROOM
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_72
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_73
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_74
+	db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; UNUSED_MAP_75
+	db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HALL_OF_FAME
+	db MUSIC_ROUTES1, BANK(Music_Routes1) ; UNDERGROUND_PATH_NORTH_SOUTH
+	db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; CHAMPIONS_ROOM
+	db MUSIC_ROUTES1, BANK(Music_Routes1) ; UNDERGROUND_PATH_WEST_EAST
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_1F
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_2F
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_3F
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_4F
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_ROOF
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_ELEVATOR
+	db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_1F
+	db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_2F
+	db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_3F
+	db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_ROOF
+	db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_MANSION_ROOF_HOUSE
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_POKECENTER
+	db MUSIC_GYM, BANK(Music_Gym) ; CELADON_GYM
+	db MUSIC_GAME_CORNER, BANK(Music_GameCorner) ; GAME_CORNER
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CELADON_MART_5F
+	db MUSIC_CELADON, BANK(Music_Celadon) ; GAME_CORNER_PRIZE_ROOM
+	db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_DINER
+	db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_CHIEF_HOUSE
+	db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_HOTEL
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LAVENDER_POKECENTER
+	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_1F
+	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_2F
+	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_3F
+	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_4F
+	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_5F
+	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_6F
+	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; POKEMON_TOWER_7F
+	db MUSIC_LAVENDER, BANK(Music_Lavender) ; MR_FUJIS_HOUSE
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LAVENDER_MART
+	db MUSIC_LAVENDER, BANK(Music_Lavender) ; LAVENDER_CUBONE_HOUSE
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FUCHSIA_MART
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_BILLS_GRANDPAS_HOUSE
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FUCHSIA_POKECENTER
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; WARDENS_HOUSE
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; SAFARI_ZONE_GATE
+	db MUSIC_GYM, BANK(Music_Gym) ; FUCHSIA_GYM
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_MEETING_ROOM
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B1F
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B2F
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B3F
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_B4F
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; VERMILION_OLD_ROD_HOUSE
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_GOOD_ROD_HOUSE
+	db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_1F
+	db MUSIC_GYM, BANK(Music_Gym) ; CINNABAR_GYM
+	db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB
+	db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_TRADE_ROOM
+	db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_METRONOME_ROOM
+	db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_LAB_FOSSIL_ROOM
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CINNABAR_POKECENTER
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CINNABAR_MART
+	db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_MART_COPY
+	db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU_LOBBY
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; COPYCATS_HOUSE_1F
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; COPYCATS_HOUSE_2F
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; FIGHTING_DOJO
+	db MUSIC_GYM, BANK(Music_Gym) ; SAFFRON_GYM
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_PIDGEY_HOUSE
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SAFFRON_MART
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_1F
+	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SAFFRON_POKECENTER
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; MR_PSYCHICS_HOUSE
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_15_GATE_1F
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_15_GATE_2F
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_16_GATE_1F
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_16_GATE_2F
+	db MUSIC_CELADON, BANK(Music_Celadon) ; ROUTE_16_FLY_HOUSE
+	db MUSIC_CELADON, BANK(Music_Celadon) ; ROUTE_12_SUPER_ROD_HOUSE
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_18_GATE_1F
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_18_GATE_2F
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SEAFOAM_ISLANDS_1F
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; ROUTE_22_GATE
+	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_2F
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ROUTE_12_GATE_2F
+	db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_TRADE_HOUSE
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DIGLETTS_CAVE
+	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VICTORY_ROAD_3F
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B1F
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B2F
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B3F
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_B4F
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; ROCKET_HIDEOUT_ELEVATOR
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CC
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CD
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UNUSED_MAP_CE
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_2F
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_3F
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_4F
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_5F
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_6F
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_7F
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_8F
+	db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_2F
+	db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_3F
+	db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; POKEMON_MANSION_B1F
+	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_EAST
+	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_NORTH
+	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_WEST
+	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_CENTER
+	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_CENTER_REST_HOUSE
+	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_SECRET_HOUSE
+	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_WEST_REST_HOUSE
+	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_EAST_REST_HOUSE
+	db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SAFARI_ZONE_NORTH_REST_HOUSE
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_2F
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_B1F
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; CERULEAN_CAVE_1F
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; NAME_RATERS_HOUSE
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; CERULEAN_BADGE_HOUSE
+	db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; UNUSED_MAP_E7
+	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; ROCK_TUNNEL_B1F
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_9F
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_10F
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_11F
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_ELEVATOR
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_ED
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_EE
+	db MUSIC_CELADON, BANK(Music_Celadon) ; TRADE_CENTER
+	db MUSIC_CELADON, BANK(Music_Celadon) ; COLOSSEUM
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F1
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F2
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F3
+	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_F4
+	db MUSIC_GYM, BANK(Music_Gym) ; LORELEIS_ROOM
+	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; BRUNOS_ROOM
+	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; AGATHAS_ROOM
diff --git a/data/special_warps.asm b/data/special_warps.asm
index 27837109..6b536b67 100755
--- a/data/special_warps.asm
+++ b/data/special_warps.asm
@@ -2,33 +2,33 @@
 ; 00: target map ID
 ; 01: which dungeon warp in the source map was used
 DungeonWarpList:
-	db SEAFOAM_ISLANDS_2,$01
-	db SEAFOAM_ISLANDS_2,$02
-	db SEAFOAM_ISLANDS_3,$01
-	db SEAFOAM_ISLANDS_3,$02
-	db SEAFOAM_ISLANDS_4,$01
-	db SEAFOAM_ISLANDS_4,$02
-	db SEAFOAM_ISLANDS_5,$01
-	db SEAFOAM_ISLANDS_5,$02
-	db VICTORY_ROAD_2,$02
-	db MANSION_1,$01
-	db MANSION_1,$02
-	db MANSION_2,$03
+	db SEAFOAM_ISLANDS_B1F,$01
+	db SEAFOAM_ISLANDS_B1F,$02
+	db SEAFOAM_ISLANDS_B2F,$01
+	db SEAFOAM_ISLANDS_B2F,$02
+	db SEAFOAM_ISLANDS_B3F,$01
+	db SEAFOAM_ISLANDS_B3F,$02
+	db SEAFOAM_ISLANDS_B4F,$01
+	db SEAFOAM_ISLANDS_B4F,$02
+	db VICTORY_ROAD_2F,$02
+	db POKEMON_MANSION_1F,$01
+	db POKEMON_MANSION_1F,$02
+	db POKEMON_MANSION_2F,$03
 	db $FF
 
 DungeonWarpData:
-	FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,18
-	FLYWARP_DATA SEAFOAM_ISLANDS_2_WIDTH,7,23
-	FLYWARP_DATA SEAFOAM_ISLANDS_3_WIDTH,7,19
-	FLYWARP_DATA SEAFOAM_ISLANDS_3_WIDTH,7,22
-	FLYWARP_DATA SEAFOAM_ISLANDS_4_WIDTH,7,18
-	FLYWARP_DATA SEAFOAM_ISLANDS_4_WIDTH,7,19
-	FLYWARP_DATA SEAFOAM_ISLANDS_5_WIDTH,14,4
-	FLYWARP_DATA SEAFOAM_ISLANDS_5_WIDTH,14,5
-	FLYWARP_DATA VICTORY_ROAD_2_WIDTH,16,22
-	FLYWARP_DATA MANSION_1_WIDTH,14,16
-	FLYWARP_DATA MANSION_1_WIDTH,14,16
-	FLYWARP_DATA MANSION_2_WIDTH,14,18
+	FLYWARP_DATA SEAFOAM_ISLANDS_B1F_WIDTH,7,18
+	FLYWARP_DATA SEAFOAM_ISLANDS_B1F_WIDTH,7,23
+	FLYWARP_DATA SEAFOAM_ISLANDS_B2F_WIDTH,7,19
+	FLYWARP_DATA SEAFOAM_ISLANDS_B2F_WIDTH,7,22
+	FLYWARP_DATA SEAFOAM_ISLANDS_B3F_WIDTH,7,18
+	FLYWARP_DATA SEAFOAM_ISLANDS_B3F_WIDTH,7,19
+	FLYWARP_DATA SEAFOAM_ISLANDS_B4F_WIDTH,14,4
+	FLYWARP_DATA SEAFOAM_ISLANDS_B4F_WIDTH,14,5
+	FLYWARP_DATA VICTORY_ROAD_2F_WIDTH,16,22
+	FLYWARP_DATA POKEMON_MANSION_1F_WIDTH,14,16
+	FLYWARP_DATA POKEMON_MANSION_1F_WIDTH,14,16
+	FLYWARP_DATA POKEMON_MANSION_2F_WIDTH,14,18
 
 ;Format:
 ;	db Map_id
diff --git a/data/super_rod.asm b/data/super_rod.asm
index 93ea992b..d3d64632 100755
--- a/data/super_rod.asm
+++ b/data/super_rod.asm
@@ -25,15 +25,15 @@ SuperRodData:
 	dbw ROUTE_25, FishingGroup3
 	dbw CERULEAN_GYM, FishingGroup3
 	dbw VERMILION_DOCK, FishingGroup4
-	dbw SEAFOAM_ISLANDS_4, FishingGroup8
-	dbw SEAFOAM_ISLANDS_5, FishingGroup8
+	dbw SEAFOAM_ISLANDS_B3F, FishingGroup8
+	dbw SEAFOAM_ISLANDS_B4F, FishingGroup8
 	dbw SAFARI_ZONE_EAST, FishingGroup6
 	dbw SAFARI_ZONE_NORTH, FishingGroup6
 	dbw SAFARI_ZONE_WEST, FishingGroup6
 	dbw SAFARI_ZONE_CENTER, FishingGroup6
-	dbw UNKNOWN_DUNGEON_2, FishingGroup9
-	dbw UNKNOWN_DUNGEON_3, FishingGroup9
-	dbw UNKNOWN_DUNGEON_1, FishingGroup9
+	dbw CERULEAN_CAVE_2F, FishingGroup9
+	dbw CERULEAN_CAVE_B1F, FishingGroup9
+	dbw CERULEAN_CAVE_1F, FishingGroup9
 	db $FF
 
 ; fishing groups
diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm
index abf584de..63ebd51b 100755
--- a/data/town_map_entries.asm
+++ b/data/town_map_entries.asm
@@ -38,64 +38,64 @@ ExternalMapEntries:
 	EMAP $B,$0,Route25Name
 
 InternalMapEntries:
-	IMAP OAKS_LAB,                  $2,$B,PalletTownName
-	IMAP VIRIDIAN_GYM,              $2,$8,ViridianCityName
-	IMAP VIRIDIAN_FOREST_ENTRANCE,  $2,$6,Route2Name
-	IMAP VIRIDIAN_FOREST,           $2,$4,ViridianForestName
-	IMAP PEWTER_POKECENTER,         $2,$3,PewterCityName
-	IMAP MT_MOON_3,                 $6,$2,MountMoonName
-	IMAP CERULEAN_MART,             $A,$2,CeruleanCityName
-	IMAP MT_MOON_POKECENTER,        $5,$2,Route4Name
-	IMAP TRASHED_HOUSE_COPY,        $A,$2,CeruleanCityName
-	IMAP DAYCAREM,                  $A,$4,Route5Name
-	IMAP PATH_ENTRANCE_ROUTE_6_COPY,$A,$6,Route6Name
-	IMAP PATH_ENTRANCE_ROUTE_7_COPY,$9,$5,Route7Name
-	IMAP PATH_ENTRANCE_ROUTE_8,     $B,$5,Route8Name
-	IMAP ROCK_TUNNEL_1,             $E,$3,RockTunnelName
-	IMAP POWER_PLANT,               $F,$4,PowerPlantName
-	IMAP ROUTE_11_GATE_2F,          $D,$9,Route11Name
-	IMAP ROUTE_12_GATE_1F,          $E,$7,Route12Name
-	IMAP BILLS_HOUSE,               $C,$0,SeaCottageName
-	IMAP VERMILION_DOCK,            $A,$9,VermilionCityName
-	IMAP SS_ANNE_10,                $9,$A,SSAnneName
-	IMAP VICTORY_ROAD_1,            $0,$4,VictoryRoadName
-	IMAP HALL_OF_FAME,              $0,$2,PokemonLeagueName
-	IMAP UNDERGROUND_PATH_NS,       $A,$5,UndergroundPathName
-	IMAP CHAMPIONS_ROOM,            $0,$2,PokemonLeagueName
-	IMAP UNDERGROUND_PATH_WE,       $A,$5,UndergroundPathName
-	IMAP CELADON_HOTEL,             $7,$5,CeladonCityName
-	IMAP LAVENDER_POKECENTER,       $E,$5,LavenderTownName
-	IMAP POKEMONTOWER_7,            $F,$5,PokemonTowerName
-	IMAP LAVENDER_HOUSE_2,          $E,$5,LavenderTownName
-	IMAP FUCHSIA_HOUSE_2,           $8,$D,FuchsiaCityName
-	IMAP SAFARI_ZONE_ENTRANCE,      $8,$C,SafariZoneName
-	IMAP FUCHSIA_MEETING_ROOM,      $8,$D,FuchsiaCityName
-	IMAP SEAFOAM_ISLANDS_5,         $5,$F,SeafoamIslandsName
-	IMAP VERMILION_HOUSE_2,         $A,$9,VermilionCityName
-	IMAP FUCHSIA_HOUSE_3,           $8,$D,FuchsiaCityName
-	IMAP MANSION_1,                 $2,$F,PokemonMansionName
-	IMAP CINNABAR_MART_COPY,        $2,$F,CinnabarIslandName
-	IMAP INDIGO_PLATEAU_LOBBY,      $0,$2,IndigoPlateauName
-	IMAP SAFFRON_HOUSE_2,           $A,$5,SaffronCityName
-	IMAP ROUTE_15_GATE_2F,          $9,$D,Route15Name
-	IMAP ROUTE_16_HOUSE,            $4,$5,Route16Name
-	IMAP ROUTE_12_HOUSE,            $E,$A,Route12Name
-	IMAP ROUTE_18_GATE_2F,          $7,$D,Route18Name
-	IMAP SEAFOAM_ISLANDS_1,         $5,$F,SeafoamIslandsName
-	IMAP ROUTE_22_GATE,             $0,$7,Route22Name
-	IMAP VICTORY_ROAD_2,            $0,$4,VictoryRoadName
-	IMAP ROUTE_12_GATE_2F,          $E,$7,Route12Name
-	IMAP VERMILION_HOUSE_3,         $A,$9,VermilionCityName
-	IMAP DIGLETTS_CAVE,             $3,$4,DiglettsCaveName
-	IMAP VICTORY_ROAD_3,            $0,$4,VictoryRoadName
-	IMAP UNUSED_MAP_CE,             $7,$5,RocketHQName
-	IMAP SILPH_CO_8F,               $A,$5,SilphCoName
-	IMAP MANSION_4,                 $2,$F,PokemonMansionName
-	IMAP SAFARI_ZONE_REST_HOUSE_4,  $8,$C,SafariZoneName
-	IMAP UNKNOWN_DUNGEON_1,         $9,$1,CeruleanCaveName
-	IMAP NAME_RATERS_HOUSE,         $E,$5,LavenderTownName
-	IMAP CERULEAN_HOUSE_2,          $A,$2,CeruleanCityName
-	IMAP ROCK_TUNNEL_2,             $E,$3,RockTunnelName
-	IMAP SILPH_CO_ELEVATOR,         $A,$5,SilphCoName
-	IMAP AGATHAS_ROOM,              $0,$2,PokemonLeagueName
+	IMAP OAKS_LAB,                      $2,$B,PalletTownName
+	IMAP VIRIDIAN_GYM,                  $2,$8,ViridianCityName
+	IMAP VIRIDIAN_FOREST_SOUTH_GATE,    $2,$6,Route2Name
+	IMAP VIRIDIAN_FOREST,               $2,$4,ViridianForestName
+	IMAP PEWTER_POKECENTER,             $2,$3,PewterCityName
+	IMAP MT_MOON_B2F,                   $6,$2,MountMoonName
+	IMAP CERULEAN_MART,                 $A,$2,CeruleanCityName
+	IMAP MT_MOON_POKECENTER,            $5,$2,Route4Name
+	IMAP CERULEAN_TRASHED_HOUSE_COPY,   $A,$2,CeruleanCityName
+	IMAP DAYCARE,                       $A,$4,Route5Name
+	IMAP UNDERGROUND_PATH_ROUTE_6_COPY, $A,$6,Route6Name
+	IMAP UNDERGROUND_PATH_ROUTE_7_COPY, $9,$5,Route7Name
+	IMAP UNDERGROUND_PATH_ROUTE_8,      $B,$5,Route8Name
+	IMAP ROCK_TUNNEL_1F,                $E,$3,RockTunnelName
+	IMAP POWER_PLANT,                   $F,$4,PowerPlantName
+	IMAP ROUTE_11_GATE_2F,              $D,$9,Route11Name
+	IMAP ROUTE_12_GATE_1F,              $E,$7,Route12Name
+	IMAP BILLS_HOUSE,                   $C,$0,SeaCottageName
+	IMAP VERMILION_DOCK,                $A,$9,VermilionCityName
+	IMAP SS_ANNE_B1F_ROOMS,             $9,$A,SSAnneName
+	IMAP VICTORY_ROAD_1F,               $0,$4,VictoryRoadName
+	IMAP HALL_OF_FAME,                  $0,$2,PokemonLeagueName
+	IMAP UNDERGROUND_PATH_NORTH_SOUTH,  $A,$5,UndergroundPathName
+	IMAP CHAMPIONS_ROOM,                $0,$2,PokemonLeagueName
+	IMAP UNDERGROUND_PATH_WEST_EAST,    $A,$5,UndergroundPathName
+	IMAP CELADON_HOTEL,                 $7,$5,CeladonCityName
+	IMAP LAVENDER_POKECENTER,           $E,$5,LavenderTownName
+	IMAP POKEMON_TOWER_7F,              $F,$5,PokemonTowerName
+	IMAP LAVENDER_CUBONE_HOUSE,         $E,$5,LavenderTownName
+	IMAP WARDENS_HOUSE,                 $8,$D,FuchsiaCityName
+	IMAP SAFARI_ZONE_GATE,              $8,$C,SafariZoneName
+	IMAP FUCHSIA_MEETING_ROOM,          $8,$D,FuchsiaCityName
+	IMAP SEAFOAM_ISLANDS_B4F,           $5,$F,SeafoamIslandsName
+	IMAP VERMILION_OLD_ROD_HOUSE,       $A,$9,VermilionCityName
+	IMAP FUCHSIA_GOOD_ROD_HOUSE,        $8,$D,FuchsiaCityName
+	IMAP POKEMON_MANSION_1F,            $2,$F,PokemonMansionName
+	IMAP CINNABAR_MART_COPY,            $2,$F,CinnabarIslandName
+	IMAP INDIGO_PLATEAU_LOBBY,          $0,$2,IndigoPlateauName
+	IMAP MR_PSYCHICS_HOUSE,             $A,$5,SaffronCityName
+	IMAP ROUTE_15_GATE_2F,              $9,$D,Route15Name
+	IMAP ROUTE_16_FLY_HOUSE,            $4,$5,Route16Name
+	IMAP ROUTE_12_SUPER_ROD_HOUSE,      $E,$A,Route12Name
+	IMAP ROUTE_18_GATE_2F,              $7,$D,Route18Name
+	IMAP SEAFOAM_ISLANDS_1F,            $5,$F,SeafoamIslandsName
+	IMAP ROUTE_22_GATE,                 $0,$7,Route22Name
+	IMAP VICTORY_ROAD_2F,               $0,$4,VictoryRoadName
+	IMAP ROUTE_12_GATE_2F,              $E,$7,Route12Name
+	IMAP VERMILION_TRADE_HOUSE,         $A,$9,VermilionCityName
+	IMAP DIGLETTS_CAVE,                 $3,$4,DiglettsCaveName
+	IMAP VICTORY_ROAD_3F,               $0,$4,VictoryRoadName
+	IMAP UNUSED_MAP_CE,                 $7,$5,RocketHQName
+	IMAP SILPH_CO_8F,                   $A,$5,SilphCoName
+	IMAP POKEMON_MANSION_B1F,           $2,$F,PokemonMansionName
+	IMAP SAFARI_ZONE_NORTH_REST_HOUSE,  $8,$C,SafariZoneName
+	IMAP CERULEAN_CAVE_1F,              $9,$1,CeruleanCaveName
+	IMAP NAME_RATERS_HOUSE,             $E,$5,LavenderTownName
+	IMAP CERULEAN_BADGE_HOUSE,          $A,$2,CeruleanCityName
+	IMAP ROCK_TUNNEL_B1F,               $E,$3,RockTunnelName
+	IMAP SILPH_CO_ELEVATOR,             $A,$5,SilphCoName
+	IMAP AGATHAS_ROOM,                  $0,$2,PokemonLeagueName
 	db $FF
diff --git a/data/town_map_order.asm b/data/town_map_order.asm
index 10131a31..a082c376 100755
--- a/data/town_map_order.asm
+++ b/data/town_map_order.asm
@@ -7,7 +7,7 @@ TownMapOrder:
 	db DIGLETTS_CAVE
 	db PEWTER_CITY
 	db ROUTE_3
-	db MT_MOON_1
+	db MT_MOON_1F
 	db ROUTE_4
 	db CERULEAN_CITY
 	db ROUTE_24
@@ -16,12 +16,12 @@ TownMapOrder:
 	db ROUTE_5
 	db ROUTE_6
 	db VERMILION_CITY
-	db SS_ANNE_1
+	db SS_ANNE_1F
 	db ROUTE_9
 	db ROCK_TUNNEL_POKECENTER
 	db ROUTE_10
 	db LAVENDER_TOWN
-	db POKEMONTOWER_2
+	db POKEMON_TOWER_2F
 	db ROUTE_8
 	db ROUTE_7
 	db CELADON_CITY
@@ -37,13 +37,13 @@ TownMapOrder:
 	db FUCHSIA_CITY
 	db SAFARI_ZONE_EAST
 	db ROUTE_19
-	db SEAFOAM_ISLANDS_2
+	db SEAFOAM_ISLANDS_B1F
 	db ROUTE_20
 	db CINNABAR_ISLAND
 	db ROUTE_21
 	db ROUTE_22
 	db ROUTE_23
-	db VICTORY_ROAD_3
+	db VICTORY_ROAD_3F
 	db INDIGO_PLATEAU
 	db POWER_PLANT
 TownMapOrderEnd:
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm
index 985a1eb2..1967d33b 100644
--- a/engine/battle/battle_transitions.asm
+++ b/engine/battle/battle_transitions.asm
@@ -118,8 +118,8 @@ GetBattleTransitionID_CompareLevels:
 	ld [wBattleTransitionSpiralDirection], a
 	ret
 
-; fails to recognize VICTORY_ROAD_2, VICTORY_ROAD_3, all ROCKET_HIDEOUT maps,
-; MANSION_1, SEAFOAM_ISLANDS_[2-5], POWER_PLANT, DIGLETTS_CAVE
+; fails to recognize VICTORY_ROAD_2F, VICTORY_ROAD_3F, all ROCKET_HIDEOUT maps,
+; POKEMON_MANSION_1F, SEAFOAM_ISLANDS_[B1F-B4F], POWER_PLANT, DIGLETTS_CAVE
 ; and SILPH_CO_[9-11]F as dungeon maps
 GetBattleTransitionID_IsDungeonMap:
 	ld a, [wCurMap]
@@ -155,30 +155,30 @@ GetBattleTransitionID_IsDungeonMap:
 ; is equal to one of these maps
 DungeonMaps1:
 	db VIRIDIAN_FOREST
-	db ROCK_TUNNEL_1
-	db SEAFOAM_ISLANDS_1
-	db ROCK_TUNNEL_2
+	db ROCK_TUNNEL_1F
+	db SEAFOAM_ISLANDS_1F
+	db ROCK_TUNNEL_B1F
 	db $FF
 
 ; GetBattleTransitionID_IsDungeonMap checks if wCurMap
 ; is in between or equal to each pair of maps
 DungeonMaps2:
 	; all MT_MOON maps
-	db MT_MOON_1
-	db MT_MOON_3
+	db MT_MOON_1F
+	db MT_MOON_B2F
 
-	; all SS_ANNE maps, VICTORY_ROAD_1, LANCES_ROOM, and HALL_OF_FAME
-	db SS_ANNE_1
+	; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME
+	db SS_ANNE_1F
 	db HALL_OF_FAME
 
-	; all POKEMONTOWER maps and Lavender Town buildings
+	; all POKEMON_TOWER maps and Lavender Town buildings
 	db LAVENDER_POKECENTER
-	db LAVENDER_HOUSE_2
+	db LAVENDER_CUBONE_HOUSE
 
-	; SILPH_CO_[2-8]F, MANSION[2-4], SAFARI_ZONE, and UNKNOWN_DUNGEON maps,
-	; except for SILPH_CO_1F
+	; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and
+	; CERULEAN_CAVE maps, except for SILPH_CO_1F
 	db SILPH_CO_2F
-	db UNKNOWN_DUNGEON_1
+	db CERULEAN_CAVE_1F
 	db $FF
 
 LoadBattleTransitionTile:
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm
index 3d46c947..4a138048 100644
--- a/engine/battle/common_text.asm
+++ b/engine/battle/common_text.asm
@@ -3,9 +3,9 @@ PrintBeginningBattleText:
 	dec a
 	jr nz, .trainerBattle
 	ld a, [wCurMap]
-	cp POKEMONTOWER_3
+	cp POKEMON_TOWER_3F
 	jr c, .notPokemonTower
-	cp LAVENDER_HOUSE_1
+	cp MR_FUJIS_HOUSE
 	jr c, .pokemonTower
 .notPokemonTower
 	ld a, [wEnemyMonSpecies2]
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 9265503d..056a9588 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -3371,9 +3371,9 @@ IsGhostBattle:
 	dec a
 	ret nz
 	ld a, [wCurMap]
-	cp POKEMONTOWER_1
+	cp POKEMON_TOWER_1F
 	jr c, .next
-	cp LAVENDER_HOUSE_1
+	cp MR_FUJIS_HOUSE
 	jr nc, .next
 	ld b, SILPH_SCOPE
 	call IsItemInBag
diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm
index bdd5d8f4..7bc912d2 100644
--- a/engine/battle/init_battle_variables.asm
+++ b/engine/battle/init_battle_variables.asm
@@ -30,7 +30,7 @@ InitBattleVariables:
 	ld a, [wCurMap]
 	cp SAFARI_ZONE_EAST
 	jr c, .notSafariBattle
-	cp SAFARI_ZONE_REST_HOUSE_1
+	cp SAFARI_ZONE_CENTER_REST_HOUSE
 	jr nc, .notSafariBattle
 	ld a, BATTLE_TYPE_SAFARI
 	ld [wBattleType], a
diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm
index f04c1deb..491be861 100755
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -79,12 +79,12 @@ SafariZoneGameOver:
 	call DisplayTextID
 	xor a
 	ld [wPlayerMovingDirection], a
-	ld a, SAFARI_ZONE_ENTRANCE
+	ld a, SAFARI_ZONE_GATE
 	ld [hWarpDestinationMap], a
 	ld a, $3
 	ld [wDestinationWarpID], a
 	ld a, $5
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	SetEvent EVENT_SAFARI_GAME_OVER
 	ld a, 1
 	ld [wSafariZoneGameOver], a
diff --git a/engine/items/items.asm b/engine/items/items.asm
index 3bb2ec9e..38e8a704 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -166,7 +166,7 @@ ItemUseBall:
 ; If the player is fighting the ghost Marowak, set the value that indicates the
 ; Pokémon can't be caught and skip the capture calculations.
 	ld a, [wCurMap]
-	cp POKEMONTOWER_6
+	cp POKEMON_TOWER_6F
 	jr nz, .loop
 	ld a, [wEnemyMonSpecies2]
 	cp MAROWAK
@@ -1511,7 +1511,7 @@ ItemUseEscapeRope:
 	ResetEvent EVENT_IN_SAFARI_ZONE
 	xor a
 	ld [wNumSafariBalls], a
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	inc a
 	ld [wEscapedFromBattle], a
 	ld [wActionResultOrTookBattleTurn], a ; item used
diff --git a/engine/overworld/field_move_messages.asm b/engine/overworld/field_move_messages.asm
index 69914bfc..b1506742 100644
--- a/engine/overworld/field_move_messages.asm
+++ b/engine/overworld/field_move_messages.asm
@@ -28,7 +28,7 @@ IsSurfingAllowed:
 	bit 5, a
 	jr nz, .forcedToRideBike
 	ld a, [wCurMap]
-	cp SEAFOAM_ISLANDS_5
+	cp SEAFOAM_ISLANDS_B4F
 	ret nz
 	CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE
 	ret z
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index 2c75b9d8..968615f0 100755
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -268,7 +268,7 @@ RLEList_PewterGymGuy:
 
 FreezeEnemyTrainerSprite:
 	ld a, [wCurMap]
-	cp POKEMONTOWER_7
+	cp POKEMON_TOWER_7F
 	ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them
 	ld hl, RivalIDs
 	ld a, [wEngagedTrainerClass]
diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm
index b8d734f2..73c55da2 100644
--- a/engine/overworld/player_state.asm
+++ b/engine/overworld/player_state.asm
@@ -55,14 +55,14 @@ CheckForceBikeOrSurf:
 	cp c ;compare x-coord
 	jr nz, .loop ; incorrect x-coord, check next item
 	ld a, [wCurMap]
-	cp SEAFOAM_ISLANDS_4
+	cp SEAFOAM_ISLANDS_B3F
 	ld a, $2
-	ld [wSeafoamIslands4CurScript], a
+	ld [wSeafoamIslandsB3FCurScript], a
 	jr z, .forceSurfing
 	ld a, [wCurMap]
-	cp SEAFOAM_ISLANDS_5
+	cp SEAFOAM_ISLANDS_B4F
 	ld a, $2
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	jr z, .forceSurfing
 	;force bike riding
 	ld hl, wd732
@@ -156,7 +156,7 @@ IsWarpTileInFrontOfPlayer:
 	push bc
 	call _GetTileAndCoordsInFrontOfPlayer
 	ld a, [wCurMap]
-	cp SS_ANNE_5
+	cp SS_ANNE_BOW
 	jr z, .ssAnne5
 	ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction
 	srl a
@@ -237,7 +237,7 @@ PrintSafariZoneSteps:
 	ld a, [wCurMap]
 	cp SAFARI_ZONE_EAST
 	ret c
-	cp UNKNOWN_DUNGEON_2
+	cp CERULEAN_CAVE_2F
 	ret nc
 	coord hl, 0, 0
 	ld b, 3
diff --git a/engine/overworld/set_blackout_map.asm b/engine/overworld/set_blackout_map.asm
index 9bfe82bd..bac2f0ca 100644
--- a/engine/overworld/set_blackout_map.asm
+++ b/engine/overworld/set_blackout_map.asm
@@ -23,7 +23,7 @@ SetLastBlackoutMap:
 	ret
 
 SafariZoneRestHouses:
-	db SAFARI_ZONE_REST_HOUSE_2
-	db SAFARI_ZONE_REST_HOUSE_3
-	db SAFARI_ZONE_REST_HOUSE_4
+	db SAFARI_ZONE_WEST_REST_HOUSE
+	db SAFARI_ZONE_EAST_REST_HOUSE
+	db SAFARI_ZONE_NORTH_REST_HOUSE
 	db -1
diff --git a/engine/palettes.asm b/engine/palettes.asm
index 4808776e..4ab83f36 100755
--- a/engine/palettes.asm
+++ b/engine/palettes.asm
@@ -147,7 +147,7 @@ SetPal_Overworld:
 	ld a, [wCurMap]
 	cp REDS_HOUSE_1F
 	jr c, .townOrRoute
-	cp UNKNOWN_DUNGEON_2
+	cp CERULEAN_CAVE_2F
 	jr c, .normalDungeonOrBuilding
 	cp NAME_RATERS_HOUSE
 	jr c, .caveOrBruno
diff --git a/gfx/blocksets/facility.bst b/gfx/blocksets/facility.bst
index 1ed2d436..31d69fd1 100644
--- a/gfx/blocksets/facility.bst
+++ b/gfx/blocksets/facility.bst
diff --git a/home.asm b/home.asm
index 5b8aaf6c..70dab701 100644
--- a/home.asm
+++ b/home.asm
@@ -1,4 +1,3 @@
-
 ; The rst vectors are unused.
 SECTION "rst 00", ROM0
 	rst $38
@@ -83,7 +82,6 @@ HideSprites::
 INCLUDE "home/copy.asm"
 
 
-
 SECTION "Entry", ROM0
 
 	nop
@@ -98,7 +96,6 @@ SECTION "Header", ROM0
 	ds $150 - $104
 
 
-
 SECTION "Main", ROM0
 
 Start::
diff --git a/home/overworld.asm b/home/overworld.asm
index 317459ce..66bf73a7 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -494,7 +494,7 @@ WarpFound2::
 	ld [wUnusedD366], a ; not read
 	ld a, [hWarpDestinationMap]
 	ld [wCurMap], a
-	cp ROCK_TUNNEL_1
+	cp ROCK_TUNNEL_1F
 	jr nz, .notRockTunnel
 	ld a, $06
 	ld [wMapPalOffset], a
@@ -718,15 +718,15 @@ CheckIfInOutsideMap::
 ; sets carry if the check passes, otherwise clears carry
 ExtraWarpCheck::
 	ld a, [wCurMap]
-	cp SS_ANNE_3
+	cp SS_ANNE_3F
 	jr z, .useFunction1
-	cp ROCKET_HIDEOUT_1
+	cp ROCKET_HIDEOUT_B1F
 	jr z, .useFunction2
-	cp ROCKET_HIDEOUT_2
+	cp ROCKET_HIDEOUT_B2F
 	jr z, .useFunction2
-	cp ROCKET_HIDEOUT_4
+	cp ROCKET_HIDEOUT_B4F
 	jr z, .useFunction2
-	cp ROCK_TUNNEL_1
+	cp ROCK_TUNNEL_1F
 	jr z, .useFunction2
 	ld a, [wCurMapTileset]
 	and a ; outside tileset (OVERWORLD)
diff --git a/main.asm b/main.asm
index 73ab724f..da4e691d 100755
--- a/main.asm
+++ b/main.asm
@@ -86,6 +86,7 @@ INCLUDE "engine/remove_pokemon.asm"
 
 INCLUDE "engine/display_pokedex.asm"
 
+
 SECTION "bank3", ROMX
 
 INCLUDE "engine/joypad.asm"
@@ -127,6 +128,7 @@ INCLUDE "engine/pathfinding.asm"
 INCLUDE "engine/hp_bar.asm"
 INCLUDE "engine/hidden_object_functions3.asm"
 
+
 SECTION "NPC Sprites 1", ROMX ; BANK $04
 
 OakAideSprite:         INCBIN "gfx/sprites/oak_aide.2bpp"
@@ -262,74 +264,74 @@ INCLUDE "engine/menu/pc.asm"
 
 SECTION "bank6", ROMX
 
-INCLUDE "data/mapHeaders/celadoncity.asm"
-INCLUDE "data/mapObjects/celadoncity.asm"
-CeladonCityBlocks: INCBIN "maps/celadoncity.blk"
+INCLUDE "data/mapHeaders/CeladonCity.asm"
+INCLUDE "data/mapObjects/CeladonCity.asm"
+CeladonCity_Blocks: INCBIN "maps/CeladonCity.blk"
 
-INCLUDE "data/mapHeaders/pallettown.asm"
-INCLUDE "data/mapObjects/pallettown.asm"
-PalletTownBlocks: INCBIN "maps/pallettown.blk"
+INCLUDE "data/mapHeaders/PalletTown.asm"
+INCLUDE "data/mapObjects/PalletTown.asm"
+PalletTown_Blocks: INCBIN "maps/PalletTown.blk"
 
-INCLUDE "data/mapHeaders/viridiancity.asm"
-INCLUDE "data/mapObjects/viridiancity.asm"
-ViridianCityBlocks: INCBIN "maps/viridiancity.blk"
+INCLUDE "data/mapHeaders/ViridianCity.asm"
+INCLUDE "data/mapObjects/ViridianCity.asm"
+ViridianCity_Blocks: INCBIN "maps/ViridianCity.blk"
 
-INCLUDE "data/mapHeaders/pewtercity.asm"
-	db $0
-INCLUDE "data/mapObjects/pewtercity.asm"
-PewterCityBlocks: INCBIN "maps/pewtercity.blk"
+INCLUDE "data/mapHeaders/PewterCity.asm"
+	ds 1
+INCLUDE "data/mapObjects/PewterCity.asm"
+PewterCity_Blocks: INCBIN "maps/PewterCity.blk"
 
-INCLUDE "data/mapHeaders/ceruleancity.asm"
-INCLUDE "data/mapObjects/ceruleancity.asm"
-CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk"
+INCLUDE "data/mapHeaders/CeruleanCity.asm"
+INCLUDE "data/mapObjects/CeruleanCity.asm"
+CeruleanCity_Blocks: INCBIN "maps/CeruleanCity.blk"
 
-INCLUDE "data/mapHeaders/vermilioncity.asm"
-INCLUDE "data/mapObjects/vermilioncity.asm"
-VermilionCityBlocks: INCBIN "maps/vermilioncity.blk"
+INCLUDE "data/mapHeaders/VermilionCity.asm"
+INCLUDE "data/mapObjects/VermilionCity.asm"
+VermilionCity_Blocks: INCBIN "maps/VermilionCity.blk"
 
-INCLUDE "data/mapHeaders/fuchsiacity.asm"
-INCLUDE "data/mapObjects/fuchsiacity.asm"
-FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk"
+INCLUDE "data/mapHeaders/FuchsiaCity.asm"
+INCLUDE "data/mapObjects/FuchsiaCity.asm"
+FuchsiaCity_Blocks: INCBIN "maps/FuchsiaCity.blk"
 
 INCLUDE "engine/play_time.asm"
 
-INCLUDE "scripts/pallettown.asm"
-INCLUDE "scripts/viridiancity.asm"
-INCLUDE "scripts/pewtercity.asm"
-INCLUDE "scripts/ceruleancity.asm"
-INCLUDE "scripts/vermilioncity.asm"
-INCLUDE "scripts/celadoncity.asm"
-INCLUDE "scripts/fuchsiacity.asm"
+INCLUDE "scripts/PalletTown.asm"
+INCLUDE "scripts/ViridianCity.asm"
+INCLUDE "scripts/PewterCity.asm"
+INCLUDE "scripts/CeruleanCity.asm"
+INCLUDE "scripts/VermilionCity.asm"
+INCLUDE "scripts/CeladonCity.asm"
+INCLUDE "scripts/FuchsiaCity.asm"
 
-INCLUDE "data/mapHeaders/blueshouse.asm"
-INCLUDE "scripts/blueshouse.asm"
-INCLUDE "data/mapObjects/blueshouse.asm"
-BluesHouseBlocks: INCBIN "maps/blueshouse.blk"
+INCLUDE "data/mapHeaders/BluesHouse.asm"
+INCLUDE "scripts/BluesHouse.asm"
+INCLUDE "data/mapObjects/BluesHouse.asm"
+BluesHouse_Blocks: INCBIN "maps/BluesHouse.blk"
 
-INCLUDE "data/mapHeaders/vermilionhouse3.asm"
-INCLUDE "scripts/vermilionhouse3.asm"
-INCLUDE "data/mapObjects/vermilionhouse3.asm"
-VermilionHouse3Blocks: INCBIN "maps/vermilionhouse3.blk"
+INCLUDE "data/mapHeaders/VermilionTradeHouse.asm"
+INCLUDE "scripts/VermilionTradeHouse.asm"
+INCLUDE "data/mapObjects/VermilionTradeHouse.asm"
+VermilionTradeHouse_Blocks: INCBIN "maps/VermilionTradeHouse.blk"
 
-INCLUDE "data/mapHeaders/indigoplateaulobby.asm"
-INCLUDE "scripts/indigoplateaulobby.asm"
-INCLUDE "data/mapObjects/indigoplateaulobby.asm"
-IndigoPlateauLobbyBlocks: INCBIN "maps/indigoplateaulobby.blk"
+INCLUDE "data/mapHeaders/IndigoPlateauLobby.asm"
+INCLUDE "scripts/IndigoPlateauLobby.asm"
+INCLUDE "data/mapObjects/IndigoPlateauLobby.asm"
+IndigoPlateauLobby_Blocks: INCBIN "maps/IndigoPlateauLobby.blk"
 
-INCLUDE "data/mapHeaders/silphco4.asm"
-INCLUDE "scripts/silphco4.asm"
-INCLUDE "data/mapObjects/silphco4.asm"
-SilphCo4Blocks: INCBIN "maps/silphco4.blk"
+INCLUDE "data/mapHeaders/SilphCo4F.asm"
+INCLUDE "scripts/SilphCo4F.asm"
+INCLUDE "data/mapObjects/SilphCo4F.asm"
+SilphCo4F_Blocks: INCBIN "maps/SilphCo4F.blk"
 
-INCLUDE "data/mapHeaders/silphco5.asm"
-INCLUDE "scripts/silphco5.asm"
-INCLUDE "data/mapObjects/silphco5.asm"
-SilphCo5Blocks: INCBIN "maps/silphco5.blk"
+INCLUDE "data/mapHeaders/SilphCo5F.asm"
+INCLUDE "scripts/SilphCo5F.asm"
+INCLUDE "data/mapObjects/SilphCo5F.asm"
+SilphCo5F_Blocks: INCBIN "maps/SilphCo5F.blk"
 
-INCLUDE "data/mapHeaders/silphco6.asm"
-INCLUDE "scripts/silphco6.asm"
-INCLUDE "data/mapObjects/silphco6.asm"
-SilphCo6Blocks: INCBIN "maps/silphco6.blk"
+INCLUDE "data/mapHeaders/SilphCo6F.asm"
+INCLUDE "scripts/SilphCo6F.asm"
+INCLUDE "data/mapObjects/SilphCo6F.asm"
+SilphCo6F_Blocks: INCBIN "maps/SilphCo6F.blk"
 
 INCLUDE "engine/overworld/npc_movement.asm"
 INCLUDE "engine/overworld/doors.asm"
@@ -338,38 +340,38 @@ INCLUDE "engine/overworld/ledges.asm"
 
 SECTION "bank7", ROMX
 
-INCLUDE "data/mapHeaders/cinnabarisland.asm"
-INCLUDE "data/mapObjects/cinnabarisland.asm"
-CinnabarIslandBlocks: INCBIN "maps/cinnabarisland.blk"
+INCLUDE "data/mapHeaders/CinnabarIsland.asm"
+INCLUDE "data/mapObjects/CinnabarIsland.asm"
+CinnabarIsland_Blocks: INCBIN "maps/CinnabarIsland.blk"
 
-INCLUDE "data/mapHeaders/route1.asm"
-INCLUDE "data/mapObjects/route1.asm"
-Route1Blocks: INCBIN "maps/route1.blk"
+INCLUDE "data/mapHeaders/Route1.asm"
+INCLUDE "data/mapObjects/Route1.asm"
+Route1_Blocks: INCBIN "maps/Route1.blk"
 
-UndergroundPathEntranceRoute8Blocks: INCBIN "maps/undergroundpathentranceroute8.blk"
+UndergroundPathRoute8_Blocks: INCBIN "maps/UndergroundPathRoute8.blk"
 
-OaksLabBlocks: INCBIN "maps/oakslab.blk"
+OaksLab_Blocks: INCBIN "maps/OaksLab.blk"
 
-Route16HouseBlocks:
-Route2HouseBlocks:
-SaffronHouse1Blocks:
-SaffronHouse2Blocks:
-VermilionHouse1Blocks:
-NameRaterBlocks:
-LavenderHouse1Blocks:
-LavenderHouse2Blocks:
-CeruleanHouse1Blocks:
-PewterHouse1Blocks:
-PewterHouse2Blocks:
-ViridianHouseBlocks: INCBIN "maps/viridianhouse.blk"
+MrPsychicsHouse_Blocks:
+NameRatersHouse_Blocks:
+MrFujisHouse_Blocks:
+Route16FlyHouse_Blocks:
+Route2TradeHouse_Blocks:
+SaffronPidgeyHouse_Blocks:
+VermilionPidgeyHouse_Blocks:
+LavenderCuboneHouse_Blocks:
+CeruleanTradeHouse_Blocks:
+PewterNidoranHouse_Blocks:
+PewterSpeechHouse_Blocks:
+ViridianNicknameHouse_Blocks: INCBIN "maps/ViridianNicknameHouse.blk"
 
-CeladonMansion5Blocks:
-SchoolBlocks: INCBIN "maps/school.blk"
+CeladonMansionRoofHouse_Blocks:
+ViridianSchoolHouse_Blocks: INCBIN "maps/ViridianSchoolHouse.blk"
 
-CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk"
+CeruleanTrashedHouse_Blocks: INCBIN "maps/CeruleanTrashedHouse.blk"
 
-DiglettsCaveEntranceRoute11Blocks:
-DiglettsCaveRoute2Blocks: INCBIN "maps/diglettscaveroute2.blk"
+DiglettsCaveRoute11_Blocks:
+DiglettsCaveRoute2_Blocks: INCBIN "maps/DiglettsCaveRoute2.blk"
 
 INCLUDE "text/monster_names.asm"
 
@@ -377,141 +379,141 @@ INCLUDE "engine/clear_save.asm"
 
 INCLUDE "engine/predefs7.asm"
 
-INCLUDE "scripts/cinnabarisland.asm"
+INCLUDE "scripts/CinnabarIsland.asm"
 
-INCLUDE "scripts/route1.asm"
+INCLUDE "scripts/Route1.asm"
 
-INCLUDE "data/mapHeaders/oakslab.asm"
-INCLUDE "scripts/oakslab.asm"
-INCLUDE "data/mapObjects/oakslab.asm"
+INCLUDE "data/mapHeaders/OaksLab.asm"
+INCLUDE "scripts/OaksLab.asm"
+INCLUDE "data/mapObjects/OaksLab.asm"
 
-INCLUDE "data/mapHeaders/viridianmart.asm"
-INCLUDE "scripts/viridianmart.asm"
-INCLUDE "data/mapObjects/viridianmart.asm"
-ViridianMartBlocks: INCBIN "maps/viridianmart.blk"
+INCLUDE "data/mapHeaders/ViridianMart.asm"
+INCLUDE "scripts/ViridianMart.asm"
+INCLUDE "data/mapObjects/ViridianMart.asm"
+ViridianMart_Blocks: INCBIN "maps/ViridianMart.blk"
 
-INCLUDE "data/mapHeaders/school.asm"
-INCLUDE "scripts/school.asm"
-INCLUDE "data/mapObjects/school.asm"
+INCLUDE "data/mapHeaders/ViridianSchoolHouse.asm"
+INCLUDE "scripts/ViridianSchoolHouse.asm"
+INCLUDE "data/mapObjects/ViridianSchoolHouse.asm"
 
-INCLUDE "data/mapHeaders/viridianhouse.asm"
-	db $0
-INCLUDE "scripts/viridianhouse.asm"
-INCLUDE "data/mapObjects/viridianhouse.asm"
+INCLUDE "data/mapHeaders/ViridianNicknameHouse.asm"
+	ds 1
+INCLUDE "scripts/ViridianNicknameHouse.asm"
+INCLUDE "data/mapObjects/ViridianNicknameHouse.asm"
 
-INCLUDE "data/mapHeaders/pewterhouse1.asm"
-INCLUDE "scripts/pewterhouse1.asm"
-INCLUDE "data/mapObjects/pewterhouse1.asm"
+INCLUDE "data/mapHeaders/PewterNidoranHouse.asm"
+INCLUDE "scripts/PewterNidoranHouse.asm"
+INCLUDE "data/mapObjects/PewterNidoranHouse.asm"
 
-INCLUDE "data/mapHeaders/pewterhouse2.asm"
-INCLUDE "scripts/pewterhouse2.asm"
-INCLUDE "data/mapObjects/pewterhouse2.asm"
+INCLUDE "data/mapHeaders/PewterSpeechHouse.asm"
+INCLUDE "scripts/PewterSpeechHouse.asm"
+INCLUDE "data/mapObjects/PewterSpeechHouse.asm"
 
-INCLUDE "data/mapHeaders/ceruleanhousetrashed.asm"
-INCLUDE "scripts/ceruleanhousetrashed.asm"
-INCLUDE "data/mapObjects/ceruleanhousetrashed.asm"
+INCLUDE "data/mapHeaders/CeruleanTrashedHouse.asm"
+INCLUDE "scripts/CeruleanTrashedHouse.asm"
+INCLUDE "data/mapObjects/CeruleanTrashedHouse.asm"
 
-INCLUDE "data/mapHeaders/ceruleanhouse1.asm"
-INCLUDE "scripts/ceruleanhouse1.asm"
-INCLUDE "data/mapObjects/ceruleanhouse1.asm"
+INCLUDE "data/mapHeaders/CeruleanTradeHouse.asm"
+INCLUDE "scripts/CeruleanTradeHouse.asm"
+INCLUDE "data/mapObjects/CeruleanTradeHouse.asm"
 
-INCLUDE "data/mapHeaders/bikeshop.asm"
-INCLUDE "scripts/bikeshop.asm"
-INCLUDE "data/mapObjects/bikeshop.asm"
-BikeShopBlocks: INCBIN "maps/bikeshop.blk"
+INCLUDE "data/mapHeaders/BikeShop.asm"
+INCLUDE "scripts/BikeShop.asm"
+INCLUDE "data/mapObjects/BikeShop.asm"
+BikeShop_Blocks: INCBIN "maps/BikeShop.blk"
 
-INCLUDE "data/mapHeaders/lavenderhouse1.asm"
-INCLUDE "scripts/lavenderhouse1.asm"
-INCLUDE "data/mapObjects/lavenderhouse1.asm"
+INCLUDE "data/mapHeaders/MrFujisHouse.asm"
+INCLUDE "scripts/MrFujisHouse.asm"
+INCLUDE "data/mapObjects/MrFujisHouse.asm"
 
-INCLUDE "data/mapHeaders/lavenderhouse2.asm"
-INCLUDE "scripts/lavenderhouse2.asm"
-INCLUDE "data/mapObjects/lavenderhouse2.asm"
+INCLUDE "data/mapHeaders/LavenderCuboneHouse.asm"
+INCLUDE "scripts/LavenderCuboneHouse.asm"
+INCLUDE "data/mapObjects/LavenderCuboneHouse.asm"
 
-INCLUDE "data/mapHeaders/namerater.asm"
-INCLUDE "scripts/namerater.asm"
-INCLUDE "data/mapObjects/namerater.asm"
+INCLUDE "data/mapHeaders/NameRatersHouse.asm"
+INCLUDE "scripts/NameRatersHouse.asm"
+INCLUDE "data/mapObjects/NameRatersHouse.asm"
 
-INCLUDE "data/mapHeaders/vermilionhouse1.asm"
-INCLUDE "scripts/vermilionhouse1.asm"
-INCLUDE "data/mapObjects/vermilionhouse1.asm"
+INCLUDE "data/mapHeaders/VermilionPidgeyHouse.asm"
+INCLUDE "scripts/VermilionPidgeyHouse.asm"
+INCLUDE "data/mapObjects/VermilionPidgeyHouse.asm"
 
-INCLUDE "data/mapHeaders/vermiliondock.asm"
-INCLUDE "scripts/vermiliondock.asm"
-INCLUDE "data/mapObjects/vermiliondock.asm"
-VermilionDockBlocks: INCBIN "maps/vermiliondock.blk"
+INCLUDE "data/mapHeaders/VermilionDock.asm"
+INCLUDE "scripts/VermilionDock.asm"
+INCLUDE "data/mapObjects/VermilionDock.asm"
+VermilionDock_Blocks: INCBIN "maps/VermilionDock.blk"
 
-INCLUDE "data/mapHeaders/celadonmansion5.asm"
-INCLUDE "scripts/celadonmansion5.asm"
-INCLUDE "data/mapObjects/celadonmansion5.asm"
+INCLUDE "data/mapHeaders/CeladonMansionRoofHouse.asm"
+INCLUDE "scripts/CeladonMansionRoofHouse.asm"
+INCLUDE "data/mapObjects/CeladonMansionRoofHouse.asm"
 
-INCLUDE "data/mapHeaders/fuchsiamart.asm"
-INCLUDE "scripts/fuchsiamart.asm"
-INCLUDE "data/mapObjects/fuchsiamart.asm"
-FuchsiaMartBlocks: INCBIN "maps/fuchsiamart.blk"
+INCLUDE "data/mapHeaders/FuchsiaMart.asm"
+INCLUDE "scripts/FuchsiaMart.asm"
+INCLUDE "data/mapObjects/FuchsiaMart.asm"
+FuchsiaMart_Blocks: INCBIN "maps/FuchsiaMart.blk"
 
-INCLUDE "data/mapHeaders/saffronhouse1.asm"
-INCLUDE "scripts/saffronhouse1.asm"
-INCLUDE "data/mapObjects/saffronhouse1.asm"
+INCLUDE "data/mapHeaders/SaffronPidgeyHouse.asm"
+INCLUDE "scripts/SaffronPidgeyHouse.asm"
+INCLUDE "data/mapObjects/SaffronPidgeyHouse.asm"
 
-INCLUDE "data/mapHeaders/saffronhouse2.asm"
-INCLUDE "scripts/saffronhouse2.asm"
-INCLUDE "data/mapObjects/saffronhouse2.asm"
+INCLUDE "data/mapHeaders/MrPsychicsHouse.asm"
+INCLUDE "scripts/MrPsychicsHouse.asm"
+INCLUDE "data/mapObjects/MrPsychicsHouse.asm"
 
-INCLUDE "data/mapHeaders/diglettscaveroute2.asm"
-INCLUDE "scripts/diglettscaveroute2.asm"
-INCLUDE "data/mapObjects/diglettscaveroute2.asm"
+INCLUDE "data/mapHeaders/DiglettsCaveRoute2.asm"
+INCLUDE "scripts/DiglettsCaveRoute2.asm"
+INCLUDE "data/mapObjects/DiglettsCaveRoute2.asm"
 
-INCLUDE "data/mapHeaders/route2house.asm"
-INCLUDE "scripts/route2house.asm"
-INCLUDE "data/mapObjects/route2house.asm"
+INCLUDE "data/mapHeaders/Route2TradeHouse.asm"
+INCLUDE "scripts/Route2TradeHouse.asm"
+INCLUDE "data/mapObjects/Route2TradeHouse.asm"
 
-INCLUDE "data/mapHeaders/route5gate.asm"
-INCLUDE "scripts/route5gate.asm"
-INCLUDE "data/mapObjects/route5gate.asm"
-Route5GateBlocks: INCBIN "maps/route5gate.blk"
+INCLUDE "data/mapHeaders/Route5Gate.asm"
+INCLUDE "scripts/Route5Gate.asm"
+INCLUDE "data/mapObjects/Route5Gate.asm"
+Route5Gate_Blocks: INCBIN "maps/Route5Gate.blk"
 
-INCLUDE "data/mapHeaders/route6gate.asm"
-INCLUDE "scripts/route6gate.asm"
-INCLUDE "data/mapObjects/route6gate.asm"
-Route6GateBlocks: INCBIN "maps/route6gate.blk"
+INCLUDE "data/mapHeaders/Route6Gate.asm"
+INCLUDE "scripts/Route6Gate.asm"
+INCLUDE "data/mapObjects/Route6Gate.asm"
+Route6Gate_Blocks: INCBIN "maps/Route6Gate.blk"
 
-INCLUDE "data/mapHeaders/route7gate.asm"
-INCLUDE "scripts/route7gate.asm"
-INCLUDE "data/mapObjects/route7gate.asm"
-Route7GateBlocks: INCBIN "maps/route7gate.blk"
+INCLUDE "data/mapHeaders/Route7Gate.asm"
+INCLUDE "scripts/Route7Gate.asm"
+INCLUDE "data/mapObjects/Route7Gate.asm"
+Route7Gate_Blocks: INCBIN "maps/Route7Gate.blk"
 
-INCLUDE "data/mapHeaders/route8gate.asm"
-INCLUDE "scripts/route8gate.asm"
-INCLUDE "data/mapObjects/route8gate.asm"
-Route8GateBlocks: INCBIN "maps/route8gate.blk"
+INCLUDE "data/mapHeaders/Route8Gate.asm"
+INCLUDE "scripts/Route8Gate.asm"
+INCLUDE "data/mapObjects/Route8Gate.asm"
+Route8Gate_Blocks: INCBIN "maps/Route8Gate.blk"
 
-INCLUDE "data/mapHeaders/undergroundpathentranceroute8.asm"
-INCLUDE "scripts/undergroundpathentranceroute8.asm"
-INCLUDE "data/mapObjects/undergroundpathentranceroute8.asm"
+INCLUDE "data/mapHeaders/UndergroundPathRoute8.asm"
+INCLUDE "scripts/UndergroundPathRoute8.asm"
+INCLUDE "data/mapObjects/UndergroundPathRoute8.asm"
 
-INCLUDE "data/mapHeaders/powerplant.asm"
-INCLUDE "scripts/powerplant.asm"
-INCLUDE "data/mapObjects/powerplant.asm"
-PowerPlantBlocks: INCBIN "maps/powerplant.blk"
+INCLUDE "data/mapHeaders/PowerPlant.asm"
+INCLUDE "scripts/PowerPlant.asm"
+INCLUDE "data/mapObjects/PowerPlant.asm"
+PowerPlant_Blocks: INCBIN "maps/PowerPlant.blk"
 
-INCLUDE "data/mapHeaders/diglettscaveroute11.asm"
-INCLUDE "scripts/diglettscaveroute11.asm"
-INCLUDE "data/mapObjects/diglettscaveroute11.asm"
+INCLUDE "data/mapHeaders/DiglettsCaveRoute11.asm"
+INCLUDE "scripts/DiglettsCaveRoute11.asm"
+INCLUDE "data/mapObjects/DiglettsCaveRoute11.asm"
 
-INCLUDE "data/mapHeaders/route16house.asm"
-INCLUDE "scripts/route16house.asm"
-INCLUDE "data/mapObjects/route16house.asm"
+INCLUDE "data/mapHeaders/Route16FlyHouse.asm"
+INCLUDE "scripts/Route16FlyHouse.asm"
+INCLUDE "data/mapObjects/Route16FlyHouse.asm"
 
-INCLUDE "data/mapHeaders/route22gate.asm"
-INCLUDE "scripts/route22gate.asm"
-INCLUDE "data/mapObjects/route22gate.asm"
-Route22GateBlocks: INCBIN "maps/route22gate.blk"
+INCLUDE "data/mapHeaders/Route22Gate.asm"
+INCLUDE "scripts/Route22Gate.asm"
+INCLUDE "data/mapObjects/Route22Gate.asm"
+Route22Gate_Blocks: INCBIN "maps/Route22Gate.blk"
 
-INCLUDE "data/mapHeaders/billshouse.asm"
-INCLUDE "scripts/billshouse.asm"
-INCLUDE "data/mapObjects/billshouse.asm"
-BillsHouseBlocks: INCBIN "maps/billshouse.blk"
+INCLUDE "data/mapHeaders/BillsHouse.asm"
+INCLUDE "scripts/BillsHouse.asm"
+INCLUDE "data/mapObjects/BillsHouse.asm"
+BillsHouse_Blocks: INCBIN "maps/BillsHouse.blk"
 
 INCLUDE "engine/menu/oaks_pc.asm"
 
@@ -581,6 +583,7 @@ TangelaPicBack::      INCBIN "pic/monback/tangelab.pic"
 
 
 SECTION "Battle (BANK 9)", ROMX
+
 INCLUDE "engine/battle/print_type.asm"
 INCLUDE "engine/battle/save_trainer_name.asm"
 INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm"
@@ -655,6 +658,7 @@ MoltresPicBack::      INCBIN "pic/monback/moltresb.pic"
 
 
 SECTION "Battle (BANK A)", ROMX
+
 INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm"
 
 
@@ -814,6 +818,7 @@ OldManPic::            INCBIN "pic/trainer/oldman.pic"
 
 
 SECTION "Battle (BANK C)", ROMX
+
 INCLUDE "engine/battle/moveEffects/mist_effect.asm"
 INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm"
 
@@ -926,326 +931,326 @@ INCLUDE "engine/trade2.asm"
 
 SECTION "bank11", ROMX
 
-INCLUDE "data/mapHeaders/lavendertown.asm"
-INCLUDE "data/mapObjects/lavendertown.asm"
-LavenderTownBlocks: INCBIN "maps/lavendertown.blk"
+INCLUDE "data/mapHeaders/LavenderTown.asm"
+INCLUDE "data/mapObjects/LavenderTown.asm"
+LavenderTown_Blocks: INCBIN "maps/LavenderTown.blk"
 
-ViridianPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk"
+ViridianPokecenter_Blocks: INCBIN "maps/ViridianPokecenter.blk"
 
-SafariZoneRestHouse1Blocks:
-SafariZoneRestHouse2Blocks:
-SafariZoneRestHouse3Blocks:
-SafariZoneRestHouse4Blocks: INCBIN "maps/safarizoneresthouse1.blk"
+SafariZoneCenterRestHouse_Blocks:
+SafariZoneWestRestHouse_Blocks:
+SafariZoneEastRestHouse_Blocks:
+SafariZoneNorthRestHouse_Blocks: INCBIN "maps/SafariZoneCenterRestHouse.blk"
 
-INCLUDE "scripts/lavendertown.asm"
+INCLUDE "scripts/LavenderTown.asm"
 
 INCLUDE "engine/pokedex_rating.asm"
 
-INCLUDE "data/mapHeaders/viridianpokecenter.asm"
-INCLUDE "scripts/viridianpokecenter.asm"
-INCLUDE "data/mapObjects/viridianpokecenter.asm"
+INCLUDE "data/mapHeaders/ViridianPokecenter.asm"
+INCLUDE "scripts/ViridianPokecenter.asm"
+INCLUDE "data/mapObjects/ViridianPokecenter.asm"
 
-INCLUDE "data/mapHeaders/mansion1.asm"
-INCLUDE "scripts/mansion1.asm"
-INCLUDE "data/mapObjects/mansion1.asm"
-Mansion1Blocks: INCBIN "maps/mansion1.blk"
+INCLUDE "data/mapHeaders/PokemonMansion1F.asm"
+INCLUDE "scripts/PokemonMansion1F.asm"
+INCLUDE "data/mapObjects/PokemonMansion1F.asm"
+PokemonMansion1F_Blocks: INCBIN "maps/PokemonMansion1F.blk"
 
-INCLUDE "data/mapHeaders/rocktunnel1.asm"
-INCLUDE "scripts/rocktunnel1.asm"
-INCLUDE "data/mapObjects/rocktunnel1.asm"
-RockTunnel1Blocks: INCBIN "maps/rocktunnel1.blk"
+INCLUDE "data/mapHeaders/RockTunnel1F.asm"
+INCLUDE "scripts/RockTunnel1F.asm"
+INCLUDE "data/mapObjects/RockTunnel1F.asm"
+RockTunnel1F_Blocks: INCBIN "maps/RockTunnel1F.blk"
 
-INCLUDE "data/mapHeaders/seafoamislands1.asm"
-INCLUDE "scripts/seafoamislands1.asm"
-INCLUDE "data/mapObjects/seafoamislands1.asm"
-SeafoamIslands1Blocks: INCBIN "maps/seafoamislands1.blk"
+INCLUDE "data/mapHeaders/SeafoamIslands1F.asm"
+INCLUDE "scripts/SeafoamIslands1F.asm"
+INCLUDE "data/mapObjects/SeafoamIslands1F.asm"
+SeafoamIslands1F_Blocks: INCBIN "maps/SeafoamIslands1F.blk"
 
-INCLUDE "data/mapHeaders/ssanne3.asm"
-INCLUDE "scripts/ssanne3.asm"
-INCLUDE "data/mapObjects/ssanne3.asm"
-SSAnne3Blocks: INCBIN "maps/ssanne3.blk"
+INCLUDE "data/mapHeaders/SSAnne3F.asm"
+INCLUDE "scripts/SSAnne3F.asm"
+INCLUDE "data/mapObjects/SSAnne3F.asm"
+SSAnne3F_Blocks: INCBIN "maps/SSAnne3F.blk"
 
-INCLUDE "data/mapHeaders/victoryroad3.asm"
-INCLUDE "scripts/victoryroad3.asm"
-INCLUDE "data/mapObjects/victoryroad3.asm"
-VictoryRoad3Blocks: INCBIN "maps/victoryroad3.blk"
+INCLUDE "data/mapHeaders/VictoryRoad3F.asm"
+INCLUDE "scripts/VictoryRoad3F.asm"
+INCLUDE "data/mapObjects/VictoryRoad3F.asm"
+VictoryRoad3F_Blocks: INCBIN "maps/VictoryRoad3F.blk"
 
-INCLUDE "data/mapHeaders/rockethideout1.asm"
-INCLUDE "scripts/rockethideout1.asm"
-INCLUDE "data/mapObjects/rockethideout1.asm"
-RocketHideout1Blocks: INCBIN "maps/rockethideout1.blk"
+INCLUDE "data/mapHeaders/RocketHideoutB1F.asm"
+INCLUDE "scripts/RocketHideoutB1F.asm"
+INCLUDE "data/mapObjects/RocketHideoutB1F.asm"
+RocketHideoutB1F_Blocks: INCBIN "maps/RocketHideoutB1F.blk"
 
-INCLUDE "data/mapHeaders/rockethideout2.asm"
-INCLUDE "scripts/rockethideout2.asm"
-INCLUDE "data/mapObjects/rockethideout2.asm"
-RocketHideout2Blocks: INCBIN "maps/rockethideout2.blk"
+INCLUDE "data/mapHeaders/RocketHideoutB2F.asm"
+INCLUDE "scripts/RocketHideoutB2F.asm"
+INCLUDE "data/mapObjects/RocketHideoutB2F.asm"
+RocketHideoutB2F_Blocks: INCBIN "maps/RocketHideoutB2F.blk"
 
-INCLUDE "data/mapHeaders/rockethideout3.asm"
-INCLUDE "scripts/rockethideout3.asm"
-INCLUDE "data/mapObjects/rockethideout3.asm"
-RocketHideout3Blocks: INCBIN "maps/rockethideout3.blk"
+INCLUDE "data/mapHeaders/RocketHideoutB3F.asm"
+INCLUDE "scripts/RocketHideoutB3F.asm"
+INCLUDE "data/mapObjects/RocketHideoutB3F.asm"
+RocketHideoutB3F_Blocks: INCBIN "maps/RocketHideoutB3F.blk"
 
-INCLUDE "data/mapHeaders/rockethideout4.asm"
-INCLUDE "scripts/rockethideout4.asm"
-INCLUDE "data/mapObjects/rockethideout4.asm"
-RocketHideout4Blocks: INCBIN "maps/rockethideout4.blk"
+INCLUDE "data/mapHeaders/RocketHideoutB4F.asm"
+INCLUDE "scripts/RocketHideoutB4F.asm"
+INCLUDE "data/mapObjects/RocketHideoutB4F.asm"
+RocketHideoutB4F_Blocks: INCBIN "maps/RocketHideoutB4F.blk"
 
-INCLUDE "data/mapHeaders/rockethideoutelevator.asm"
-INCLUDE "scripts/rockethideoutelevator.asm"
-INCLUDE "data/mapObjects/rockethideoutelevator.asm"
-RocketHideoutElevatorBlocks: INCBIN "maps/rockethideoutelevator.blk"
+INCLUDE "data/mapHeaders/RocketHideoutElevator.asm"
+INCLUDE "scripts/RocketHideoutElevator.asm"
+INCLUDE "data/mapObjects/RocketHideoutElevator.asm"
+RocketHideoutElevator_Blocks: INCBIN "maps/RocketHideoutElevator.blk"
 
-INCLUDE "data/mapHeaders/silphcoelevator.asm"
-INCLUDE "scripts/silphcoelevator.asm"
-INCLUDE "data/mapObjects/silphcoelevator.asm"
-SilphCoElevatorBlocks: INCBIN "maps/silphcoelevator.blk"
+INCLUDE "data/mapHeaders/SilphCoElevator.asm"
+INCLUDE "scripts/SilphCoElevator.asm"
+INCLUDE "data/mapObjects/SilphCoElevator.asm"
+SilphCoElevator_Blocks: INCBIN "maps/SilphCoElevator.blk"
 
-INCLUDE "data/mapHeaders/safarizoneeast.asm"
-INCLUDE "scripts/safarizoneeast.asm"
-INCLUDE "data/mapObjects/safarizoneeast.asm"
-SafariZoneEastBlocks: INCBIN "maps/safarizoneeast.blk"
+INCLUDE "data/mapHeaders/SafariZoneEast.asm"
+INCLUDE "scripts/SafariZoneEast.asm"
+INCLUDE "data/mapObjects/SafariZoneEast.asm"
+SafariZoneEast_Blocks: INCBIN "maps/SafariZoneEast.blk"
 
-INCLUDE "data/mapHeaders/safarizonenorth.asm"
-INCLUDE "scripts/safarizonenorth.asm"
-INCLUDE "data/mapObjects/safarizonenorth.asm"
-SafariZoneNorthBlocks: INCBIN "maps/safarizonenorth.blk"
+INCLUDE "data/mapHeaders/SafariZoneNorth.asm"
+INCLUDE "scripts/SafariZoneNorth.asm"
+INCLUDE "data/mapObjects/SafariZoneNorth.asm"
+SafariZoneNorth_Blocks: INCBIN "maps/SafariZoneNorth.blk"
 
-INCLUDE "data/mapHeaders/safarizonecenter.asm"
-INCLUDE "scripts/safarizonecenter.asm"
-INCLUDE "data/mapObjects/safarizonecenter.asm"
-SafariZoneCenterBlocks: INCBIN "maps/safarizonecenter.blk"
+INCLUDE "data/mapHeaders/SafariZoneCenter.asm"
+INCLUDE "scripts/SafariZoneCenter.asm"
+INCLUDE "data/mapObjects/SafariZoneCenter.asm"
+SafariZoneCenter_Blocks: INCBIN "maps/SafariZoneCenter.blk"
 
-INCLUDE "data/mapHeaders/safarizoneresthouse1.asm"
-INCLUDE "scripts/safarizoneresthouse1.asm"
-INCLUDE "data/mapObjects/safarizoneresthouse1.asm"
+INCLUDE "data/mapHeaders/SafariZoneCenterRestHouse.asm"
+INCLUDE "scripts/SafariZoneCenterRestHouse.asm"
+INCLUDE "data/mapObjects/SafariZoneCenterRestHouse.asm"
 
-INCLUDE "data/mapHeaders/safarizoneresthouse2.asm"
-INCLUDE "scripts/safarizoneresthouse2.asm"
-INCLUDE "data/mapObjects/safarizoneresthouse2.asm"
+INCLUDE "data/mapHeaders/SafariZoneWestRestHouse.asm"
+INCLUDE "scripts/SafariZoneWestRestHouse.asm"
+INCLUDE "data/mapObjects/SafariZoneWestRestHouse.asm"
 
-INCLUDE "data/mapHeaders/safarizoneresthouse3.asm"
-INCLUDE "scripts/safarizoneresthouse3.asm"
-INCLUDE "data/mapObjects/safarizoneresthouse3.asm"
+INCLUDE "data/mapHeaders/SafariZoneEastRestHouse.asm"
+INCLUDE "scripts/SafariZoneEastRestHouse.asm"
+INCLUDE "data/mapObjects/SafariZoneEastRestHouse.asm"
 
-INCLUDE "data/mapHeaders/safarizoneresthouse4.asm"
-INCLUDE "scripts/safarizoneresthouse4.asm"
-INCLUDE "data/mapObjects/safarizoneresthouse4.asm"
+INCLUDE "data/mapHeaders/SafariZoneNorthRestHouse.asm"
+INCLUDE "scripts/SafariZoneNorthRestHouse.asm"
+INCLUDE "data/mapObjects/SafariZoneNorthRestHouse.asm"
 
-INCLUDE "data/mapHeaders/unknowndungeon2.asm"
-INCLUDE "scripts/unknowndungeon2.asm"
-INCLUDE "data/mapObjects/unknowndungeon2.asm"
-UnknownDungeon2Blocks: INCBIN "maps/unknowndungeon2.blk"
+INCLUDE "data/mapHeaders/CeruleanCave2F.asm"
+INCLUDE "scripts/CeruleanCave2F.asm"
+INCLUDE "data/mapObjects/CeruleanCave2F.asm"
+CeruleanCave2F_Blocks: INCBIN "maps/CeruleanCave2F.blk"
 
-INCLUDE "data/mapHeaders/unknowndungeon3.asm"
-INCLUDE "scripts/unknowndungeon3.asm"
-INCLUDE "data/mapObjects/unknowndungeon3.asm"
-UnknownDungeon3Blocks: INCBIN "maps/unknowndungeon3.blk"
+INCLUDE "data/mapHeaders/CeruleanCaveB1F.asm"
+INCLUDE "scripts/CeruleanCaveB1F.asm"
+INCLUDE "data/mapObjects/CeruleanCaveB1F.asm"
+CeruleanCaveB1F_Blocks: INCBIN "maps/CeruleanCaveB1F.blk"
 
-INCLUDE "data/mapHeaders/rocktunnel2.asm"
-INCLUDE "scripts/rocktunnel2.asm"
-INCLUDE "data/mapObjects/rocktunnel2.asm"
-RockTunnel2Blocks: INCBIN "maps/rocktunnel2.blk"
+INCLUDE "data/mapHeaders/RockTunnelB1F.asm"
+INCLUDE "scripts/RockTunnelB1F.asm"
+INCLUDE "data/mapObjects/RockTunnelB1F.asm"
+RockTunnelB1F_Blocks: INCBIN "maps/RockTunnelB1F.blk"
 
-INCLUDE "data/mapHeaders/seafoamislands2.asm"
-INCLUDE "scripts/seafoamislands2.asm"
-INCLUDE "data/mapObjects/seafoamislands2.asm"
-SeafoamIslands2Blocks: INCBIN "maps/seafoamislands2.blk"
+INCLUDE "data/mapHeaders/SeafoamIslandsB1F.asm"
+INCLUDE "scripts/SeafoamIslandsB1F.asm"
+INCLUDE "data/mapObjects/SeafoamIslandsB1F.asm"
+SeafoamIslandsB1F_Blocks: INCBIN "maps/SeafoamIslandsB1F.blk"
 
-INCLUDE "data/mapHeaders/seafoamislands3.asm"
-INCLUDE "scripts/seafoamislands3.asm"
-INCLUDE "data/mapObjects/seafoamislands3.asm"
-SeafoamIslands3Blocks: INCBIN "maps/seafoamislands3.blk"
+INCLUDE "data/mapHeaders/SeafoamIslandsB2F.asm"
+INCLUDE "scripts/SeafoamIslandsB2F.asm"
+INCLUDE "data/mapObjects/SeafoamIslandsB2F.asm"
+SeafoamIslandsB2F_Blocks: INCBIN "maps/SeafoamIslandsB2F.blk"
 
-INCLUDE "data/mapHeaders/seafoamislands4.asm"
-INCLUDE "scripts/seafoamislands4.asm"
-INCLUDE "data/mapObjects/seafoamislands4.asm"
-SeafoamIslands4Blocks: INCBIN "maps/seafoamislands4.blk"
+INCLUDE "data/mapHeaders/SeafoamIslandsB3F.asm"
+INCLUDE "scripts/SeafoamIslandsB3F.asm"
+INCLUDE "data/mapObjects/SeafoamIslandsB3F.asm"
+SeafoamIslandsB3F_Blocks: INCBIN "maps/SeafoamIslandsB3F.blk"
 
-INCLUDE "data/mapHeaders/seafoamislands5.asm"
-INCLUDE "scripts/seafoamislands5.asm"
-INCLUDE "data/mapObjects/seafoamislands5.asm"
-SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk"
+INCLUDE "data/mapHeaders/SeafoamIslandsB4F.asm"
+INCLUDE "scripts/SeafoamIslandsB4F.asm"
+INCLUDE "data/mapObjects/SeafoamIslandsB4F.asm"
+SeafoamIslandsB4F_Blocks: INCBIN "maps/SeafoamIslandsB4F.blk"
 
 INCLUDE "engine/overworld/hidden_objects.asm"
 
 
 SECTION "bank12", ROMX
 
-INCLUDE "data/mapHeaders/route7.asm"
-INCLUDE "data/mapObjects/route7.asm"
-Route7Blocks: INCBIN "maps/route7.blk"
+INCLUDE "data/mapHeaders/Route7.asm"
+INCLUDE "data/mapObjects/Route7.asm"
+Route7_Blocks: INCBIN "maps/Route7.blk"
 
-CeladonPokecenterBlocks:
-RockTunnelPokecenterBlocks:
-MtMoonPokecenterBlocks: INCBIN "maps/mtmoonpokecenter.blk"
+CeladonPokecenter_Blocks:
+RockTunnelPokecenter_Blocks:
+MtMoonPokecenter_Blocks: INCBIN "maps/MtMoonPokecenter.blk"
 
-Route18GateBlocks:
-Route15GateBlocks:
-Route11GateBlocks: INCBIN "maps/route11gate.blk"
+Route18Gate1F_Blocks:
+Route15Gate1F_Blocks:
+Route11Gate1F_Blocks: INCBIN "maps/Route11Gate1F.blk"
 
-Route18GateUpstairsBlocks:
-Route16GateUpstairsBlocks:
-Route12GateUpstairsBlocks:
-Route15GateUpstairsBlocks:
-Route11GateUpstairsBlocks: INCBIN "maps/route11gateupstairs.blk"
+Route18Gate2F_Blocks:
+Route16Gate2F_Blocks:
+Route15Gate2F_Blocks:
+Route12Gate2F_Blocks:
+Route11Gate2F_Blocks: INCBIN "maps/Route11Gate2F.blk"
 
 INCLUDE "engine/predefs12.asm"
 
-INCLUDE "scripts/route7.asm"
+INCLUDE "scripts/Route7.asm"
 
-INCLUDE "data/mapHeaders/redshouse1f.asm"
-INCLUDE "scripts/redshouse1f.asm"
-INCLUDE "data/mapObjects/redshouse1f.asm"
-RedsHouse1FBlocks: INCBIN "maps/redshouse1f.blk"
+INCLUDE "data/mapHeaders/RedsHouse1F.asm"
+INCLUDE "scripts/RedsHouse1F.asm"
+INCLUDE "data/mapObjects/RedsHouse1F.asm"
+RedsHouse1F_Blocks: INCBIN "maps/RedsHouse1F.blk"
 
-INCLUDE "data/mapHeaders/celadonmart3.asm"
-INCLUDE "scripts/celadonmart3.asm"
-INCLUDE "data/mapObjects/celadonmart3.asm"
-CeladonMart3Blocks: INCBIN "maps/celadonmart3.blk"
+INCLUDE "data/mapHeaders/CeladonMart3F.asm"
+INCLUDE "scripts/CeladonMart3F.asm"
+INCLUDE "data/mapObjects/CeladonMart3F.asm"
+CeladonMart3F_Blocks: INCBIN "maps/CeladonMart3F.blk"
 
-INCLUDE "data/mapHeaders/celadonmart4.asm"
-INCLUDE "scripts/celadonmart4.asm"
-INCLUDE "data/mapObjects/celadonmart4.asm"
-CeladonMart4Blocks: INCBIN "maps/celadonmart4.blk"
+INCLUDE "data/mapHeaders/CeladonMart4F.asm"
+INCLUDE "scripts/CeladonMart4F.asm"
+INCLUDE "data/mapObjects/CeladonMart4F.asm"
+CeladonMart4F_Blocks: INCBIN "maps/CeladonMart4F.blk"
 
-INCLUDE "data/mapHeaders/celadonmartroof.asm"
-INCLUDE "scripts/celadonmartroof.asm"
-INCLUDE "data/mapObjects/celadonmartroof.asm"
-CeladonMartRoofBlocks: INCBIN "maps/celadonmartroof.blk"
+INCLUDE "data/mapHeaders/CeladonMartRoof.asm"
+INCLUDE "scripts/CeladonMartRoof.asm"
+INCLUDE "data/mapObjects/CeladonMartRoof.asm"
+CeladonMartRoof_Blocks: INCBIN "maps/CeladonMartRoof.blk"
 
-INCLUDE "data/mapHeaders/celadonmartelevator.asm"
-INCLUDE "scripts/celadonmartelevator.asm"
-INCLUDE "data/mapObjects/celadonmartelevator.asm"
-CeladonMartElevatorBlocks: INCBIN "maps/celadonmartelevator.blk"
+INCLUDE "data/mapHeaders/CeladonMartElevator.asm"
+INCLUDE "scripts/CeladonMartElevator.asm"
+INCLUDE "data/mapObjects/CeladonMartElevator.asm"
+CeladonMartElevator_Blocks: INCBIN "maps/CeladonMartElevator.blk"
 
-INCLUDE "data/mapHeaders/celadonmansion1.asm"
-INCLUDE "scripts/celadonmansion1.asm"
-INCLUDE "data/mapObjects/celadonmansion1.asm"
-CeladonMansion1Blocks: INCBIN "maps/celadonmansion1.blk"
+INCLUDE "data/mapHeaders/CeladonMansion1F.asm"
+INCLUDE "scripts/CeladonMansion1F.asm"
+INCLUDE "data/mapObjects/CeladonMansion1F.asm"
+CeladonMansion1F_Blocks: INCBIN "maps/CeladonMansion1F.blk"
 
-INCLUDE "data/mapHeaders/celadonmansion2.asm"
-INCLUDE "scripts/celadonmansion2.asm"
-INCLUDE "data/mapObjects/celadonmansion2.asm"
-CeladonMansion2Blocks: INCBIN "maps/celadonmansion2.blk"
+INCLUDE "data/mapHeaders/CeladonMansion2F.asm"
+INCLUDE "scripts/CeladonMansion2F.asm"
+INCLUDE "data/mapObjects/CeladonMansion2F.asm"
+CeladonMansion2F_Blocks: INCBIN "maps/CeladonMansion2F.blk"
 
-INCLUDE "data/mapHeaders/celadonmansion3.asm"
-INCLUDE "scripts/celadonmansion3.asm"
-INCLUDE "data/mapObjects/celadonmansion3.asm"
-CeladonMansion3Blocks: INCBIN "maps/celadonmansion3.blk"
+INCLUDE "data/mapHeaders/CeladonMansion3F.asm"
+INCLUDE "scripts/CeladonMansion3F.asm"
+INCLUDE "data/mapObjects/CeladonMansion3F.asm"
+CeladonMansion3F_Blocks: INCBIN "maps/CeladonMansion3F.blk"
 
-INCLUDE "data/mapHeaders/celadonmansion4.asm"
-INCLUDE "scripts/celadonmansion4.asm"
-INCLUDE "data/mapObjects/celadonmansion4.asm"
-CeladonMansion4Blocks: INCBIN "maps/celadonmansion4.blk"
+INCLUDE "data/mapHeaders/CeladonMansionRoof.asm"
+INCLUDE "scripts/CeladonMansionRoof.asm"
+INCLUDE "data/mapObjects/CeladonMansionRoof.asm"
+CeladonMansionRoof_Blocks: INCBIN "maps/CeladonMansionRoof.blk"
 
-INCLUDE "data/mapHeaders/celadonpokecenter.asm"
-INCLUDE "scripts/celadonpokecenter.asm"
-INCLUDE "data/mapObjects/celadonpokecenter.asm"
+INCLUDE "data/mapHeaders/CeladonPokecenter.asm"
+INCLUDE "scripts/CeladonPokecenter.asm"
+INCLUDE "data/mapObjects/CeladonPokecenter.asm"
 
-INCLUDE "data/mapHeaders/celadongym.asm"
-INCLUDE "scripts/celadongym.asm"
-INCLUDE "data/mapObjects/celadongym.asm"
-CeladonGymBlocks: INCBIN "maps/celadongym.blk"
+INCLUDE "data/mapHeaders/CeladonGym.asm"
+INCLUDE "scripts/CeladonGym.asm"
+INCLUDE "data/mapObjects/CeladonGym.asm"
+CeladonGym_Blocks: INCBIN "maps/CeladonGym.blk"
 
-INCLUDE "data/mapHeaders/celadongamecorner.asm"
-INCLUDE "scripts/celadongamecorner.asm"
-INCLUDE "data/mapObjects/celadongamecorner.asm"
-CeladonGameCornerBlocks: INCBIN "maps/celadongamecorner.blk"
+INCLUDE "data/mapHeaders/GameCorner.asm"
+INCLUDE "scripts/GameCorner.asm"
+INCLUDE "data/mapObjects/GameCorner.asm"
+GameCorner_Blocks: INCBIN "maps/GameCorner.blk"
 
-INCLUDE "data/mapHeaders/celadonmart5.asm"
-INCLUDE "scripts/celadonmart5.asm"
-INCLUDE "data/mapObjects/celadonmart5.asm"
-CeladonMart5Blocks: INCBIN "maps/celadonmart5.blk"
+INCLUDE "data/mapHeaders/CeladonMart5F.asm"
+INCLUDE "scripts/CeladonMart5F.asm"
+INCLUDE "data/mapObjects/CeladonMart5F.asm"
+CeladonMart5F_Blocks: INCBIN "maps/CeladonMart5F.blk"
 
-INCLUDE "data/mapHeaders/celadonprizeroom.asm"
-INCLUDE "scripts/celadonprizeroom.asm"
-INCLUDE "data/mapObjects/celadonprizeroom.asm"
-CeladonPrizeRoomBlocks: INCBIN "maps/celadonprizeroom.blk"
+INCLUDE "data/mapHeaders/GameCornerPrizeRoom.asm"
+INCLUDE "scripts/GameCornerPrizeRoom.asm"
+INCLUDE "data/mapObjects/GameCornerPrizeRoom.asm"
+GameCornerPrizeRoom_Blocks: INCBIN "maps/GameCornerPrizeRoom.blk"
 
-INCLUDE "data/mapHeaders/celadondiner.asm"
-INCLUDE "scripts/celadondiner.asm"
-INCLUDE "data/mapObjects/celadondiner.asm"
-CeladonDinerBlocks: INCBIN "maps/celadondiner.blk"
+INCLUDE "data/mapHeaders/CeladonDiner.asm"
+INCLUDE "scripts/CeladonDiner.asm"
+INCLUDE "data/mapObjects/CeladonDiner.asm"
+CeladonDiner_Blocks: INCBIN "maps/CeladonDiner.blk"
 
-INCLUDE "data/mapHeaders/celadonhouse.asm"
-INCLUDE "scripts/celadonhouse.asm"
-INCLUDE "data/mapObjects/celadonhouse.asm"
-CeladonHouseBlocks: INCBIN "maps/celadonhouse.blk"
+INCLUDE "data/mapHeaders/CeladonChiefHouse.asm"
+INCLUDE "scripts/CeladonChiefHouse.asm"
+INCLUDE "data/mapObjects/CeladonChiefHouse.asm"
+CeladonChiefHouse_Blocks: INCBIN "maps/CeladonChiefHouse.blk"
 
-INCLUDE "data/mapHeaders/celadonhotel.asm"
-INCLUDE "scripts/celadonhotel.asm"
-INCLUDE "data/mapObjects/celadonhotel.asm"
-CeladonHotelBlocks: INCBIN "maps/celadonhotel.blk"
+INCLUDE "data/mapHeaders/CeladonHotel.asm"
+INCLUDE "scripts/CeladonHotel.asm"
+INCLUDE "data/mapObjects/CeladonHotel.asm"
+CeladonHotel_Blocks: INCBIN "maps/CeladonHotel.blk"
 
-INCLUDE "data/mapHeaders/mtmoonpokecenter.asm"
-INCLUDE "scripts/mtmoonpokecenter.asm"
-INCLUDE "data/mapObjects/mtmoonpokecenter.asm"
+INCLUDE "data/mapHeaders/MtMoonPokecenter.asm"
+INCLUDE "scripts/MtMoonPokecenter.asm"
+INCLUDE "data/mapObjects/MtMoonPokecenter.asm"
 
-INCLUDE "data/mapHeaders/rocktunnelpokecenter.asm"
-INCLUDE "scripts/rocktunnelpokecenter.asm"
-INCLUDE "data/mapObjects/rocktunnelpokecenter.asm"
+INCLUDE "data/mapHeaders/RockTunnelPokecenter.asm"
+INCLUDE "scripts/RockTunnelPokecenter.asm"
+INCLUDE "data/mapObjects/RockTunnelPokecenter.asm"
 
-INCLUDE "data/mapHeaders/route11gate.asm"
-INCLUDE "scripts/route11gate.asm"
-INCLUDE "data/mapObjects/route11gate.asm"
+INCLUDE "data/mapHeaders/Route11Gate1F.asm"
+INCLUDE "scripts/Route11Gate1F.asm"
+INCLUDE "data/mapObjects/Route11Gate1F.asm"
 
-INCLUDE "data/mapHeaders/route11gateupstairs.asm"
-INCLUDE "scripts/route11gateupstairs.asm"
-INCLUDE "data/mapObjects/route11gateupstairs.asm"
+INCLUDE "data/mapHeaders/Route11Gate2F.asm"
+INCLUDE "scripts/Route11Gate2F.asm"
+INCLUDE "data/mapObjects/Route11Gate2F.asm"
 
-INCLUDE "data/mapHeaders/route12gate.asm"
-INCLUDE "scripts/route12gate.asm"
-INCLUDE "data/mapObjects/route12gate.asm"
-Route12GateBlocks: INCBIN "maps/route12gate.blk"
+INCLUDE "data/mapHeaders/Route12Gate1F.asm"
+INCLUDE "scripts/Route12Gate1F.asm"
+INCLUDE "data/mapObjects/Route12Gate1F.asm"
+Route12Gate1F_Blocks: INCBIN "maps/Route12Gate1F.blk"
 
-INCLUDE "data/mapHeaders/route12gateupstairs.asm"
-INCLUDE "scripts/route12gateupstairs.asm"
-INCLUDE "data/mapObjects/route12gateupstairs.asm"
+INCLUDE "data/mapHeaders/Route12Gate2F.asm"
+INCLUDE "scripts/Route12Gate2F.asm"
+INCLUDE "data/mapObjects/Route12Gate2F.asm"
 
-INCLUDE "data/mapHeaders/route15gate.asm"
-INCLUDE "scripts/route15gate.asm"
-INCLUDE "data/mapObjects/route15gate.asm"
+INCLUDE "data/mapHeaders/Route15Gate1F.asm"
+INCLUDE "scripts/Route15Gate1F.asm"
+INCLUDE "data/mapObjects/Route15Gate1F.asm"
 
-INCLUDE "data/mapHeaders/route15gateupstairs.asm"
-INCLUDE "scripts/route15gateupstairs.asm"
-INCLUDE "data/mapObjects/route15gateupstairs.asm"
+INCLUDE "data/mapHeaders/Route15Gate2F.asm"
+INCLUDE "scripts/Route15Gate2F.asm"
+INCLUDE "data/mapObjects/Route15Gate2F.asm"
 
-INCLUDE "data/mapHeaders/route16gate.asm"
-INCLUDE "scripts/route16gate.asm"
-INCLUDE "data/mapObjects/route16gate.asm"
-Route16GateBlocks: INCBIN "maps/route16gate.blk"
+INCLUDE "data/mapHeaders/Route16Gate1F.asm"
+INCLUDE "scripts/Route16Gate1F.asm"
+INCLUDE "data/mapObjects/Route16Gate1F.asm"
+Route16Gate1F_Blocks: INCBIN "maps/Route16Gate1F.blk"
 
-INCLUDE "data/mapHeaders/route16gateupstairs.asm"
-INCLUDE "scripts/route16gateupstairs.asm"
-INCLUDE "data/mapObjects/route16gateupstairs.asm"
+INCLUDE "data/mapHeaders/Route16Gate2F.asm"
+INCLUDE "scripts/Route16Gate2F.asm"
+INCLUDE "data/mapObjects/Route16Gate2F.asm"
 
-INCLUDE "data/mapHeaders/route18gate.asm"
-INCLUDE "scripts/route18gate.asm"
-INCLUDE "data/mapObjects/route18gate.asm"
+INCLUDE "data/mapHeaders/Route18Gate1F.asm"
+INCLUDE "scripts/Route18Gate1F.asm"
+INCLUDE "data/mapObjects/Route18Gate1F.asm"
 
-INCLUDE "data/mapHeaders/route18gateupstairs.asm"
-INCLUDE "scripts/route18gateupstairs.asm"
-INCLUDE "data/mapObjects/route18gateupstairs.asm"
+INCLUDE "data/mapHeaders/Route18Gate2F.asm"
+INCLUDE "scripts/Route18Gate2F.asm"
+INCLUDE "data/mapObjects/Route18Gate2F.asm"
 
-INCLUDE "data/mapHeaders/mtmoon1.asm"
-INCLUDE "scripts/mtmoon1.asm"
-INCLUDE "data/mapObjects/mtmoon1.asm"
-MtMoon1Blocks: INCBIN "maps/mtmoon1.blk"
+INCLUDE "data/mapHeaders/MtMoon1F.asm"
+INCLUDE "scripts/MtMoon1F.asm"
+INCLUDE "data/mapObjects/MtMoon1F.asm"
+MtMoon1F_Blocks: INCBIN "maps/MtMoon1F.blk"
 
-INCLUDE "data/mapHeaders/mtmoon3.asm"
-INCLUDE "scripts/mtmoon3.asm"
-INCLUDE "data/mapObjects/mtmoon3.asm"
-MtMoon3Blocks: INCBIN "maps/mtmoon3.blk"
+INCLUDE "data/mapHeaders/MtMoonB2F.asm"
+INCLUDE "scripts/MtMoonB2F.asm"
+INCLUDE "data/mapObjects/MtMoonB2F.asm"
+MtMoonB2F_Blocks: INCBIN "maps/MtMoonB2F.blk"
 
-INCLUDE "data/mapHeaders/safarizonewest.asm"
-INCLUDE "scripts/safarizonewest.asm"
-INCLUDE "data/mapObjects/safarizonewest.asm"
-SafariZoneWestBlocks: INCBIN "maps/safarizonewest.blk"
+INCLUDE "data/mapHeaders/SafariZoneWest.asm"
+INCLUDE "scripts/SafariZoneWest.asm"
+INCLUDE "data/mapObjects/SafariZoneWest.asm"
+SafariZoneWest_Blocks: INCBIN "maps/SafariZoneWest.blk"
 
-INCLUDE "data/mapHeaders/safarizonesecrethouse.asm"
-INCLUDE "scripts/safarizonesecrethouse.asm"
-INCLUDE "data/mapObjects/safarizonesecrethouse.asm"
-SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk"
+INCLUDE "data/mapHeaders/SafariZoneSecretHouse.asm"
+INCLUDE "scripts/SafariZoneSecretHouse.asm"
+INCLUDE "data/mapObjects/SafariZoneSecretHouse.asm"
+SafariZoneSecretHouse_Blocks: INCBIN "maps/SafariZoneSecretHouse.blk"
 
 
 SECTION "bank13", ROMX
@@ -1298,15 +1303,15 @@ ChannelerPic::     INCBIN "pic/trainer/channeler.pic"
 AgathaPic::        INCBIN "pic/trainer/agatha.pic"
 LancePic::         INCBIN "pic/trainer/lance.pic"
 
-INCLUDE "data/mapHeaders/tradecenter.asm"
-INCLUDE "scripts/tradecenter.asm"
-INCLUDE "data/mapObjects/tradecenter.asm"
-TradeCenterBlocks: INCBIN "maps/tradecenter.blk"
+INCLUDE "data/mapHeaders/TradeCenter.asm"
+INCLUDE "scripts/TradeCenter.asm"
+INCLUDE "data/mapObjects/TradeCenter.asm"
+TradeCenter_Blocks: INCBIN "maps/TradeCenter.blk"
 
-INCLUDE "data/mapHeaders/colosseum.asm"
-INCLUDE "scripts/colosseum.asm"
-INCLUDE "data/mapObjects/colosseum.asm"
-ColosseumBlocks: INCBIN "maps/colosseum.blk"
+INCLUDE "data/mapHeaders/Colosseum.asm"
+INCLUDE "scripts/Colosseum.asm"
+INCLUDE "data/mapObjects/Colosseum.asm"
+Colosseum_Blocks: INCBIN "maps/Colosseum.blk"
 
 INCLUDE "engine/give_pokemon.asm"
 
@@ -1315,71 +1320,71 @@ INCLUDE "engine/predefs.asm"
 
 SECTION "bank14", ROMX
 
-INCLUDE "data/mapHeaders/route22.asm"
-INCLUDE "data/mapObjects/route22.asm"
-Route22Blocks: INCBIN "maps/route22.blk"
+INCLUDE "data/mapHeaders/Route22.asm"
+INCLUDE "data/mapObjects/Route22.asm"
+Route22_Blocks: INCBIN "maps/Route22.blk"
 
-INCLUDE "data/mapHeaders/route20.asm"
-INCLUDE "data/mapObjects/route20.asm"
-Route20Blocks: INCBIN "maps/route20.blk"
+INCLUDE "data/mapHeaders/Route20.asm"
+INCLUDE "data/mapObjects/Route20.asm"
+Route20_Blocks: INCBIN "maps/Route20.blk"
 
-INCLUDE "data/mapHeaders/route23.asm"
-INCLUDE "data/mapObjects/route23.asm"
-Route23Blocks: INCBIN "maps/route23.blk"
+INCLUDE "data/mapHeaders/Route23.asm"
+INCLUDE "data/mapObjects/Route23.asm"
+Route23_Blocks: INCBIN "maps/Route23.blk"
 
-INCLUDE "data/mapHeaders/route24.asm"
-INCLUDE "data/mapObjects/route24.asm"
-Route24Blocks: INCBIN "maps/route24.blk"
+INCLUDE "data/mapHeaders/Route24.asm"
+INCLUDE "data/mapObjects/Route24.asm"
+Route24_Blocks: INCBIN "maps/Route24.blk"
 
-INCLUDE "data/mapHeaders/route25.asm"
-INCLUDE "data/mapObjects/route25.asm"
-Route25Blocks: INCBIN "maps/route25.blk"
+INCLUDE "data/mapHeaders/Route25.asm"
+INCLUDE "data/mapObjects/Route25.asm"
+Route25_Blocks: INCBIN "maps/Route25.blk"
 
-INCLUDE "data/mapHeaders/indigoplateau.asm"
-INCLUDE "scripts/indigoplateau.asm"
-INCLUDE "data/mapObjects/indigoplateau.asm"
-IndigoPlateauBlocks: INCBIN "maps/indigoplateau.blk"
+INCLUDE "data/mapHeaders/IndigoPlateau.asm"
+INCLUDE "scripts/IndigoPlateau.asm"
+INCLUDE "data/mapObjects/IndigoPlateau.asm"
+IndigoPlateau_Blocks: INCBIN "maps/IndigoPlateau.blk"
 
-INCLUDE "data/mapHeaders/saffroncity.asm"
-INCLUDE "data/mapObjects/saffroncity.asm"
-SaffronCityBlocks: INCBIN "maps/saffroncity.blk"
-INCLUDE "scripts/saffroncity.asm"
+INCLUDE "data/mapHeaders/SaffronCity.asm"
+INCLUDE "data/mapObjects/SaffronCity.asm"
+SaffronCity_Blocks: INCBIN "maps/SaffronCity.blk"
+INCLUDE "scripts/SaffronCity.asm"
 
-INCLUDE "scripts/route20.asm"
-INCLUDE "scripts/route22.asm"
-INCLUDE "scripts/route23.asm"
-INCLUDE "scripts/route24.asm"
-INCLUDE "scripts/route25.asm"
+INCLUDE "scripts/Route20.asm"
+INCLUDE "scripts/Route22.asm"
+INCLUDE "scripts/Route23.asm"
+INCLUDE "scripts/Route24.asm"
+INCLUDE "scripts/Route25.asm"
 
-INCLUDE "data/mapHeaders/victoryroad2.asm"
-INCLUDE "scripts/victoryroad2.asm"
-INCLUDE "data/mapObjects/victoryroad2.asm"
-VictoryRoad2Blocks: INCBIN "maps/victoryroad2.blk"
+INCLUDE "data/mapHeaders/VictoryRoad2F.asm"
+INCLUDE "scripts/VictoryRoad2F.asm"
+INCLUDE "data/mapObjects/VictoryRoad2F.asm"
+VictoryRoad2F_Blocks: INCBIN "maps/VictoryRoad2F.blk"
 
-INCLUDE "data/mapHeaders/mtmoon2.asm"
-INCLUDE "scripts/mtmoon2.asm"
-INCLUDE "data/mapObjects/mtmoon2.asm"
-MtMoon2Blocks: INCBIN "maps/mtmoon2.blk"
+INCLUDE "data/mapHeaders/MtMoonB1F.asm"
+INCLUDE "scripts/MtMoonB1F.asm"
+INCLUDE "data/mapObjects/MtMoonB1F.asm"
+MtMoonB1F_Blocks: INCBIN "maps/MtMoonB1F.blk"
 
-INCLUDE "data/mapHeaders/silphco7.asm"
-INCLUDE "scripts/silphco7.asm"
-INCLUDE "data/mapObjects/silphco7.asm"
-SilphCo7Blocks: INCBIN "maps/silphco7.blk"
+INCLUDE "data/mapHeaders/SilphCo7F.asm"
+INCLUDE "scripts/SilphCo7F.asm"
+INCLUDE "data/mapObjects/SilphCo7F.asm"
+SilphCo7F_Blocks: INCBIN "maps/SilphCo7F.blk"
 
-INCLUDE "data/mapHeaders/mansion2.asm"
-INCLUDE "scripts/mansion2.asm"
-INCLUDE "data/mapObjects/mansion2.asm"
-Mansion2Blocks: INCBIN "maps/mansion2.blk"
+INCLUDE "data/mapHeaders/PokemonMansion2F.asm"
+INCLUDE "scripts/PokemonMansion2F.asm"
+INCLUDE "data/mapObjects/PokemonMansion2F.asm"
+PokemonMansion2F_Blocks: INCBIN "maps/PokemonMansion2F.blk"
 
-INCLUDE "data/mapHeaders/mansion3.asm"
-INCLUDE "scripts/mansion3.asm"
-INCLUDE "data/mapObjects/mansion3.asm"
-Mansion3Blocks: INCBIN "maps/mansion3.blk"
+INCLUDE "data/mapHeaders/PokemonMansion3F.asm"
+INCLUDE "scripts/PokemonMansion3F.asm"
+INCLUDE "data/mapObjects/PokemonMansion3F.asm"
+PokemonMansion3F_Blocks: INCBIN "maps/PokemonMansion3F.blk"
 
-INCLUDE "data/mapHeaders/mansion4.asm"
-INCLUDE "scripts/mansion4.asm"
-INCLUDE "data/mapObjects/mansion4.asm"
-Mansion4Blocks: INCBIN "maps/mansion4.blk"
+INCLUDE "data/mapHeaders/PokemonMansionB1F.asm"
+INCLUDE "scripts/PokemonMansionB1F.asm"
+INCLUDE "data/mapObjects/PokemonMansionB1F.asm"
+PokemonMansionB1F_Blocks: INCBIN "maps/PokemonMansionB1F.blk"
 
 INCLUDE "engine/battle/init_battle_variables.asm"
 INCLUDE "engine/battle/moveEffects/paralyze_effect.asm"
@@ -1393,90 +1398,90 @@ INCLUDE "engine/hidden_object_functions14.asm"
 
 SECTION "bank15", ROMX
 
-INCLUDE "data/mapHeaders/route2.asm"
-INCLUDE "data/mapObjects/route2.asm"
-Route2Blocks: INCBIN "maps/route2.blk"
+INCLUDE "data/mapHeaders/Route2.asm"
+INCLUDE "data/mapObjects/Route2.asm"
+Route2_Blocks: INCBIN "maps/Route2.blk"
 
-INCLUDE "data/mapHeaders/route3.asm"
-INCLUDE "data/mapObjects/route3.asm"
-Route3Blocks: INCBIN "maps/route3.blk"
+INCLUDE "data/mapHeaders/Route3.asm"
+INCLUDE "data/mapObjects/Route3.asm"
+Route3_Blocks: INCBIN "maps/Route3.blk"
 
-INCLUDE "data/mapHeaders/route4.asm"
-INCLUDE "data/mapObjects/route4.asm"
-Route4Blocks: INCBIN "maps/route4.blk"
+INCLUDE "data/mapHeaders/Route4.asm"
+INCLUDE "data/mapObjects/Route4.asm"
+Route4_Blocks: INCBIN "maps/Route4.blk"
 
-INCLUDE "data/mapHeaders/route5.asm"
-INCLUDE "data/mapObjects/route5.asm"
-Route5Blocks: INCBIN "maps/route5.blk"
+INCLUDE "data/mapHeaders/Route5.asm"
+INCLUDE "data/mapObjects/Route5.asm"
+Route5_Blocks: INCBIN "maps/Route5.blk"
 
-INCLUDE "data/mapHeaders/route9.asm"
-INCLUDE "data/mapObjects/route9.asm"
-Route9Blocks: INCBIN "maps/route9.blk"
+INCLUDE "data/mapHeaders/Route9.asm"
+INCLUDE "data/mapObjects/Route9.asm"
+Route9_Blocks: INCBIN "maps/Route9.blk"
 
-INCLUDE "data/mapHeaders/route13.asm"
-INCLUDE "data/mapObjects/route13.asm"
-Route13Blocks: INCBIN "maps/route13.blk"
+INCLUDE "data/mapHeaders/Route13.asm"
+INCLUDE "data/mapObjects/Route13.asm"
+Route13_Blocks: INCBIN "maps/Route13.blk"
 
-INCLUDE "data/mapHeaders/route14.asm"
-INCLUDE "data/mapObjects/route14.asm"
-Route14Blocks: INCBIN "maps/route14.blk"
+INCLUDE "data/mapHeaders/Route14.asm"
+INCLUDE "data/mapObjects/Route14.asm"
+Route14_Blocks: INCBIN "maps/Route14.blk"
 
-INCLUDE "data/mapHeaders/route17.asm"
-INCLUDE "data/mapObjects/route17.asm"
-Route17Blocks: INCBIN "maps/route17.blk"
+INCLUDE "data/mapHeaders/Route17.asm"
+INCLUDE "data/mapObjects/Route17.asm"
+Route17_Blocks: INCBIN "maps/Route17.blk"
 
-INCLUDE "data/mapHeaders/route19.asm"
-INCLUDE "data/mapObjects/route19.asm"
-Route19Blocks: INCBIN "maps/route19.blk"
+INCLUDE "data/mapHeaders/Route19.asm"
+INCLUDE "data/mapObjects/Route19.asm"
+Route19_Blocks: INCBIN "maps/Route19.blk"
 
-INCLUDE "data/mapHeaders/route21.asm"
-INCLUDE "data/mapObjects/route21.asm"
-Route21Blocks: INCBIN "maps/route21.blk"
+INCLUDE "data/mapHeaders/Route21.asm"
+INCLUDE "data/mapObjects/Route21.asm"
+Route21_Blocks: INCBIN "maps/Route21.blk"
 
-VermilionHouse2Blocks:
-Route12HouseBlocks:
-DayCareMBlocks: INCBIN "maps/daycarem.blk"
+VermilionOldRodHouse_Blocks:
+Route12SuperRodHouse_Blocks:
+Daycare_Blocks: INCBIN "maps/Daycare.blk"
 
-FuchsiaHouse3Blocks: INCBIN "maps/fuchsiahouse3.blk"
+FuchsiaGoodRodHouse_Blocks: INCBIN "maps/FuchsiaGoodRodHouse.blk"
 
 INCLUDE "engine/battle/experience.asm"
 
-INCLUDE "scripts/route2.asm"
-INCLUDE "scripts/route3.asm"
-INCLUDE "scripts/route4.asm"
-INCLUDE "scripts/route5.asm"
-INCLUDE "scripts/route9.asm"
-INCLUDE "scripts/route13.asm"
-INCLUDE "scripts/route14.asm"
-INCLUDE "scripts/route17.asm"
-INCLUDE "scripts/route19.asm"
-INCLUDE "scripts/route21.asm"
+INCLUDE "scripts/Route2.asm"
+INCLUDE "scripts/Route3.asm"
+INCLUDE "scripts/Route4.asm"
+INCLUDE "scripts/Route5.asm"
+INCLUDE "scripts/Route9.asm"
+INCLUDE "scripts/Route13.asm"
+INCLUDE "scripts/Route14.asm"
+INCLUDE "scripts/Route17.asm"
+INCLUDE "scripts/Route19.asm"
+INCLUDE "scripts/Route21.asm"
 
-INCLUDE "data/mapHeaders/vermilionhouse2.asm"
-INCLUDE "scripts/vermilionhouse2.asm"
-INCLUDE "data/mapObjects/vermilionhouse2.asm"
+INCLUDE "data/mapHeaders/VermilionOldRodHouse.asm"
+INCLUDE "scripts/VermilionOldRodHouse.asm"
+INCLUDE "data/mapObjects/VermilionOldRodHouse.asm"
 
-INCLUDE "data/mapHeaders/celadonmart2.asm"
-INCLUDE "scripts/celadonmart2.asm"
-INCLUDE "data/mapObjects/celadonmart2.asm"
-CeladonMart2Blocks: INCBIN "maps/celadonmart2.blk"
+INCLUDE "data/mapHeaders/CeladonMart2F.asm"
+INCLUDE "scripts/CeladonMart2F.asm"
+INCLUDE "data/mapObjects/CeladonMart2F.asm"
+CeladonMart2F_Blocks: INCBIN "maps/CeladonMart2F.blk"
 
-INCLUDE "data/mapHeaders/fuchsiahouse3.asm"
-INCLUDE "scripts/fuchsiahouse3.asm"
-INCLUDE "data/mapObjects/fuchsiahouse3.asm"
+INCLUDE "data/mapHeaders/FuchsiaGoodRodHouse.asm"
+INCLUDE "scripts/FuchsiaGoodRodHouse.asm"
+INCLUDE "data/mapObjects/FuchsiaGoodRodHouse.asm"
 
-INCLUDE "data/mapHeaders/daycarem.asm"
-INCLUDE "scripts/daycarem.asm"
-INCLUDE "data/mapObjects/daycarem.asm"
+INCLUDE "data/mapHeaders/Daycare.asm"
+INCLUDE "scripts/Daycare.asm"
+INCLUDE "data/mapObjects/Daycare.asm"
 
-INCLUDE "data/mapHeaders/route12house.asm"
-INCLUDE "scripts/route12house.asm"
-INCLUDE "data/mapObjects/route12house.asm"
+INCLUDE "data/mapHeaders/Route12SuperRodHouse.asm"
+INCLUDE "scripts/Route12SuperRodHouse.asm"
+INCLUDE "data/mapObjects/Route12SuperRodHouse.asm"
 
-INCLUDE "data/mapHeaders/silphco8.asm"
-INCLUDE "scripts/silphco8.asm"
-INCLUDE "data/mapObjects/silphco8.asm"
-SilphCo8Blocks: INCBIN "maps/silphco8.blk"
+INCLUDE "data/mapHeaders/SilphCo8F.asm"
+INCLUDE "scripts/SilphCo8F.asm"
+INCLUDE "data/mapObjects/SilphCo8F.asm"
+SilphCo8F_Blocks: INCBIN "maps/SilphCo8F.blk"
 
 INCLUDE "engine/menu/diploma.asm"
 
@@ -1485,39 +1490,39 @@ INCLUDE "engine/overworld/trainers.asm"
 
 SECTION "bank16", ROMX
 
-INCLUDE "data/mapHeaders/route6.asm"
-INCLUDE "data/mapObjects/route6.asm"
-Route6Blocks: INCBIN "maps/route6.blk"
+INCLUDE "data/mapHeaders/Route6.asm"
+INCLUDE "data/mapObjects/Route6.asm"
+Route6_Blocks: INCBIN "maps/Route6.blk"
 
-INCLUDE "data/mapHeaders/route8.asm"
-INCLUDE "data/mapObjects/route8.asm"
-Route8Blocks: INCBIN "maps/route8.blk"
+INCLUDE "data/mapHeaders/Route8.asm"
+INCLUDE "data/mapObjects/Route8.asm"
+Route8_Blocks: INCBIN "maps/Route8.blk"
 
-INCLUDE "data/mapHeaders/route10.asm"
-INCLUDE "data/mapObjects/route10.asm"
-Route10Blocks: INCBIN "maps/route10.blk"
+INCLUDE "data/mapHeaders/Route10.asm"
+INCLUDE "data/mapObjects/Route10.asm"
+Route10_Blocks: INCBIN "maps/Route10.blk"
 
-INCLUDE "data/mapHeaders/route11.asm"
-INCLUDE "data/mapObjects/route11.asm"
-Route11Blocks: INCBIN "maps/route11.blk"
+INCLUDE "data/mapHeaders/Route11.asm"
+INCLUDE "data/mapObjects/Route11.asm"
+Route11_Blocks: INCBIN "maps/Route11.blk"
 
-INCLUDE "data/mapHeaders/route12.asm"
-INCLUDE "data/mapObjects/route12.asm"
-Route12Blocks: INCBIN "maps/route12.blk"
+INCLUDE "data/mapHeaders/Route12.asm"
+INCLUDE "data/mapObjects/Route12.asm"
+Route12_Blocks: INCBIN "maps/Route12.blk"
 
-INCLUDE "data/mapHeaders/route15.asm"
-INCLUDE "data/mapObjects/route15.asm"
-Route15Blocks: INCBIN "maps/route15.blk"
+INCLUDE "data/mapHeaders/Route15.asm"
+INCLUDE "data/mapObjects/Route15.asm"
+Route15_Blocks: INCBIN "maps/Route15.blk"
 
-INCLUDE "data/mapHeaders/route16.asm"
-INCLUDE "data/mapObjects/route16.asm"
-Route16Blocks: INCBIN "maps/route16.blk"
+INCLUDE "data/mapHeaders/Route16.asm"
+INCLUDE "data/mapObjects/Route16.asm"
+Route16_Blocks: INCBIN "maps/Route16.blk"
 
-INCLUDE "data/mapHeaders/route18.asm"
-INCLUDE "data/mapObjects/route18.asm"
-Route18Blocks: INCBIN "maps/route18.blk"
+INCLUDE "data/mapHeaders/Route18.asm"
+INCLUDE "data/mapObjects/Route18.asm"
+Route18_Blocks: INCBIN "maps/Route18.blk"
 
-	INCBIN "maps/unusedblocks58d7d.blk"
+	INCBIN "maps/UnusedPokecenterCopy.blk"
 
 INCLUDE "engine/battle/common_text.asm"
 
@@ -1525,198 +1530,198 @@ INCLUDE "engine/experience.asm"
 
 INCLUDE "engine/overworld/oaks_aide.asm"
 
-INCLUDE "scripts/route6.asm"
-INCLUDE "scripts/route8.asm"
-INCLUDE "scripts/route10.asm"
-INCLUDE "scripts/route11.asm"
-INCLUDE "scripts/route12.asm"
-INCLUDE "scripts/route15.asm"
-INCLUDE "scripts/route16.asm"
-INCLUDE "scripts/route18.asm"
+INCLUDE "scripts/Route6.asm"
+INCLUDE "scripts/Route8.asm"
+INCLUDE "scripts/Route10.asm"
+INCLUDE "scripts/Route11.asm"
+INCLUDE "scripts/Route12.asm"
+INCLUDE "scripts/Route15.asm"
+INCLUDE "scripts/Route16.asm"
+INCLUDE "scripts/Route18.asm"
 
-INCLUDE "data/mapHeaders/fanclub.asm"
-INCLUDE "scripts/fanclub.asm"
-INCLUDE "data/mapObjects/fanclub.asm"
-FanClubBlocks: INCBIN "maps/fanclub.blk"
+INCLUDE "data/mapHeaders/PokemonFanClub.asm"
+INCLUDE "scripts/PokemonFanClub.asm"
+INCLUDE "data/mapObjects/PokemonFanClub.asm"
+PokemonFanClub_Blocks: INCBIN "maps/PokemonFanClub.blk"
 
-INCLUDE "data/mapHeaders/silphco2.asm"
-INCLUDE "scripts/silphco2.asm"
-INCLUDE "data/mapObjects/silphco2.asm"
-SilphCo2Blocks: INCBIN "maps/silphco2.blk"
+INCLUDE "data/mapHeaders/SilphCo2F.asm"
+INCLUDE "scripts/SilphCo2F.asm"
+INCLUDE "data/mapObjects/SilphCo2F.asm"
+SilphCo2F_Blocks: INCBIN "maps/SilphCo2F.blk"
 
-INCLUDE "data/mapHeaders/silphco3.asm"
-INCLUDE "scripts/silphco3.asm"
-INCLUDE "data/mapObjects/silphco3.asm"
-SilphCo3Blocks: INCBIN "maps/silphco3.blk"
+INCLUDE "data/mapHeaders/SilphCo3F.asm"
+INCLUDE "scripts/SilphCo3F.asm"
+INCLUDE "data/mapObjects/SilphCo3F.asm"
+SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk"
 
-INCLUDE "data/mapHeaders/silphco10.asm"
-INCLUDE "scripts/silphco10.asm"
-INCLUDE "data/mapObjects/silphco10.asm"
-SilphCo10Blocks: INCBIN "maps/silphco10.blk"
+INCLUDE "data/mapHeaders/SilphCo10F.asm"
+INCLUDE "scripts/SilphCo10F.asm"
+INCLUDE "data/mapObjects/SilphCo10F.asm"
+SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk"
 
-INCLUDE "data/mapHeaders/lance.asm"
-INCLUDE "scripts/lance.asm"
-INCLUDE "data/mapObjects/lance.asm"
-LanceBlocks: INCBIN "maps/lance.blk"
+INCLUDE "data/mapHeaders/LancesRoom.asm"
+INCLUDE "scripts/LancesRoom.asm"
+INCLUDE "data/mapObjects/LancesRoom.asm"
+LancesRoom_Blocks: INCBIN "maps/LancesRoom.blk"
 
-INCLUDE "data/mapHeaders/halloffameroom.asm"
-INCLUDE "scripts/halloffameroom.asm"
-INCLUDE "data/mapObjects/halloffameroom.asm"
-HallofFameRoomBlocks: INCBIN "maps/halloffameroom.blk"
+INCLUDE "data/mapHeaders/HallOfFame.asm"
+INCLUDE "scripts/HallOfFame.asm"
+INCLUDE "data/mapObjects/HallOfFame.asm"
+HallOfFame_Blocks: INCBIN "maps/HallOfFame.blk"
 
 INCLUDE "engine/overworld/saffron_guards.asm"
 
 
 SECTION "bank17", ROMX
 
-SaffronMartBlocks:
-LavenderMartBlocks:
-CeruleanMartBlocks:
-VermilionMartBlocks: INCBIN "maps/vermilionmart.blk"
+SaffronMart_Blocks:
+LavenderMart_Blocks:
+CeruleanMart_Blocks:
+VermilionMart_Blocks: INCBIN "maps/VermilionMart.blk"
 
-CopycatsHouse2FBlocks:
-RedsHouse2FBlocks: INCBIN "maps/redshouse2f.blk"
+CopycatsHouse2F_Blocks:
+RedsHouse2F_Blocks: INCBIN "maps/RedsHouse2F.blk"
 
-Museum1FBlocks: INCBIN "maps/museum1f.blk"
+Museum1F_Blocks: INCBIN "maps/Museum1F.blk"
 
-Museum2FBlocks: INCBIN "maps/museum2f.blk"
+Museum2F_Blocks: INCBIN "maps/Museum2F.blk"
 
-SaffronPokecenterBlocks:
-VermilionPokecenterBlocks:
-LavenderPokecenterBlocks:
-PewterPokecenterBlocks: INCBIN "maps/pewterpokecenter.blk"
+SaffronPokecenter_Blocks:
+VermilionPokecenter_Blocks:
+LavenderPokecenter_Blocks:
+PewterPokecenter_Blocks: INCBIN "maps/PewterPokecenter.blk"
 
-UndergroundPathEntranceRoute7Blocks:
-UndergroundPathEntranceRoute7CopyBlocks:
-UndergroundPathEntranceRoute6Blocks:
-UndergroundPathEntranceRoute5Blocks: INCBIN "maps/undergroundpathentranceroute5.blk"
+UndergroundPathRoute7_Blocks:
+UndergroundPathRoute7Copy_Blocks:
+UndergroundPathRoute6_Blocks:
+UndergroundPathRoute5_Blocks: INCBIN "maps/UndergroundPathRoute5.blk"
 
-Route2GateBlocks:
-ViridianForestEntranceBlocks:
-ViridianForestExitBlocks: INCBIN "maps/viridianforestexit.blk"
+Route2Gate_Blocks:
+ViridianForestSouthGate_Blocks:
+ViridianForestNorthGate_Blocks: INCBIN "maps/ViridianForestNorthGate.blk"
 
-INCLUDE "data/mapHeaders/redshouse2f.asm"
-INCLUDE "scripts/redshouse2f.asm"
-INCLUDE "data/mapObjects/redshouse2f.asm"
+INCLUDE "data/mapHeaders/RedsHouse2F.asm"
+INCLUDE "scripts/RedsHouse2F.asm"
+INCLUDE "data/mapObjects/RedsHouse2F.asm"
 
 INCLUDE "engine/predefs17.asm"
 
-INCLUDE "data/mapHeaders/museum1f.asm"
-INCLUDE "scripts/museum1f.asm"
-INCLUDE "data/mapObjects/museum1f.asm"
+INCLUDE "data/mapHeaders/Museum1F.asm"
+INCLUDE "scripts/Museum1F.asm"
+INCLUDE "data/mapObjects/Museum1F.asm"
 
-INCLUDE "data/mapHeaders/museum2f.asm"
-INCLUDE "scripts/museum2f.asm"
-INCLUDE "data/mapObjects/museum2f.asm"
+INCLUDE "data/mapHeaders/Museum2F.asm"
+INCLUDE "scripts/Museum2F.asm"
+INCLUDE "data/mapObjects/Museum2F.asm"
 
-INCLUDE "data/mapHeaders/pewtergym.asm"
-INCLUDE "scripts/pewtergym.asm"
-INCLUDE "data/mapObjects/pewtergym.asm"
-PewterGymBlocks: INCBIN "maps/pewtergym.blk"
+INCLUDE "data/mapHeaders/PewterGym.asm"
+INCLUDE "scripts/PewterGym.asm"
+INCLUDE "data/mapObjects/PewterGym.asm"
+PewterGym_Blocks: INCBIN "maps/PewterGym.blk"
 
-INCLUDE "data/mapHeaders/pewterpokecenter.asm"
-INCLUDE "scripts/pewterpokecenter.asm"
-INCLUDE "data/mapObjects/pewterpokecenter.asm"
+INCLUDE "data/mapHeaders/PewterPokecenter.asm"
+INCLUDE "scripts/PewterPokecenter.asm"
+INCLUDE "data/mapObjects/PewterPokecenter.asm"
 
-INCLUDE "data/mapHeaders/ceruleanpokecenter.asm"
-INCLUDE "scripts/ceruleanpokecenter.asm"
-INCLUDE "data/mapObjects/ceruleanpokecenter.asm"
-CeruleanPokecenterBlocks: INCBIN "maps/ceruleanpokecenter.blk"
+INCLUDE "data/mapHeaders/CeruleanPokecenter.asm"
+INCLUDE "scripts/CeruleanPokecenter.asm"
+INCLUDE "data/mapObjects/CeruleanPokecenter.asm"
+CeruleanPokecenter_Blocks: INCBIN "maps/CeruleanPokecenter.blk"
 
-INCLUDE "data/mapHeaders/ceruleangym.asm"
-INCLUDE "scripts/ceruleangym.asm"
-INCLUDE "data/mapObjects/ceruleangym.asm"
-CeruleanGymBlocks: INCBIN "maps/ceruleangym.blk"
+INCLUDE "data/mapHeaders/CeruleanGym.asm"
+INCLUDE "scripts/CeruleanGym.asm"
+INCLUDE "data/mapObjects/CeruleanGym.asm"
+CeruleanGym_Blocks: INCBIN "maps/CeruleanGym.blk"
 
-INCLUDE "data/mapHeaders/ceruleanmart.asm"
-INCLUDE "scripts/ceruleanmart.asm"
-INCLUDE "data/mapObjects/ceruleanmart.asm"
+INCLUDE "data/mapHeaders/CeruleanMart.asm"
+INCLUDE "scripts/CeruleanMart.asm"
+INCLUDE "data/mapObjects/CeruleanMart.asm"
 
-INCLUDE "data/mapHeaders/lavenderpokecenter.asm"
-INCLUDE "scripts/lavenderpokecenter.asm"
-INCLUDE "data/mapObjects/lavenderpokecenter.asm"
+INCLUDE "data/mapHeaders/LavenderPokecenter.asm"
+INCLUDE "scripts/LavenderPokecenter.asm"
+INCLUDE "data/mapObjects/LavenderPokecenter.asm"
 
-INCLUDE "data/mapHeaders/lavendermart.asm"
-INCLUDE "scripts/lavendermart.asm"
-INCLUDE "data/mapObjects/lavendermart.asm"
+INCLUDE "data/mapHeaders/LavenderMart.asm"
+INCLUDE "scripts/LavenderMart.asm"
+INCLUDE "data/mapObjects/LavenderMart.asm"
 
-INCLUDE "data/mapHeaders/vermilionpokecenter.asm"
-INCLUDE "scripts/vermilionpokecenter.asm"
-INCLUDE "data/mapObjects/vermilionpokecenter.asm"
+INCLUDE "data/mapHeaders/VermilionPokecenter.asm"
+INCLUDE "scripts/VermilionPokecenter.asm"
+INCLUDE "data/mapObjects/VermilionPokecenter.asm"
 
-INCLUDE "data/mapHeaders/vermilionmart.asm"
-INCLUDE "scripts/vermilionmart.asm"
-INCLUDE "data/mapObjects/vermilionmart.asm"
+INCLUDE "data/mapHeaders/VermilionMart.asm"
+INCLUDE "scripts/VermilionMart.asm"
+INCLUDE "data/mapObjects/VermilionMart.asm"
 
-INCLUDE "data/mapHeaders/vermiliongym.asm"
-INCLUDE "scripts/vermiliongym.asm"
-INCLUDE "data/mapObjects/vermiliongym.asm"
-VermilionGymBlocks: INCBIN "maps/vermiliongym.blk"
+INCLUDE "data/mapHeaders/VermilionGym.asm"
+INCLUDE "scripts/VermilionGym.asm"
+INCLUDE "data/mapObjects/VermilionGym.asm"
+VermilionGym_Blocks: INCBIN "maps/VermilionGym.blk"
 
-INCLUDE "data/mapHeaders/copycatshouse2f.asm"
-INCLUDE "scripts/copycatshouse2f.asm"
-INCLUDE "data/mapObjects/copycatshouse2f.asm"
+INCLUDE "data/mapHeaders/CopycatsHouse2F.asm"
+INCLUDE "scripts/CopycatsHouse2F.asm"
+INCLUDE "data/mapObjects/CopycatsHouse2F.asm"
 
-INCLUDE "data/mapHeaders/fightingdojo.asm"
-INCLUDE "scripts/fightingdojo.asm"
-INCLUDE "data/mapObjects/fightingdojo.asm"
-FightingDojoBlocks: INCBIN "maps/fightingdojo.blk"
+INCLUDE "data/mapHeaders/FightingDojo.asm"
+INCLUDE "scripts/FightingDojo.asm"
+INCLUDE "data/mapObjects/FightingDojo.asm"
+FightingDojo_Blocks: INCBIN "maps/FightingDojo.blk"
 
-INCLUDE "data/mapHeaders/saffrongym.asm"
-INCLUDE "scripts/saffrongym.asm"
-INCLUDE "data/mapObjects/saffrongym.asm"
-SaffronGymBlocks: INCBIN "maps/saffrongym.blk"
+INCLUDE "data/mapHeaders/SaffronGym.asm"
+INCLUDE "scripts/SaffronGym.asm"
+INCLUDE "data/mapObjects/SaffronGym.asm"
+SaffronGym_Blocks: INCBIN "maps/SaffronGym.blk"
 
-INCLUDE "data/mapHeaders/saffronmart.asm"
-INCLUDE "scripts/saffronmart.asm"
-INCLUDE "data/mapObjects/saffronmart.asm"
+INCLUDE "data/mapHeaders/SaffronMart.asm"
+INCLUDE "scripts/SaffronMart.asm"
+INCLUDE "data/mapObjects/SaffronMart.asm"
 
-INCLUDE "data/mapHeaders/silphco1.asm"
-INCLUDE "scripts/silphco1.asm"
-INCLUDE "data/mapObjects/silphco1.asm"
-SilphCo1Blocks: INCBIN "maps/silphco1.blk"
+INCLUDE "data/mapHeaders/SilphCo1F.asm"
+INCLUDE "scripts/SilphCo1F.asm"
+INCLUDE "data/mapObjects/SilphCo1F.asm"
+SilphCo1F_Blocks: INCBIN "maps/SilphCo1F.blk"
 
-INCLUDE "data/mapHeaders/saffronpokecenter.asm"
-INCLUDE "scripts/saffronpokecenter.asm"
-INCLUDE "data/mapObjects/saffronpokecenter.asm"
+INCLUDE "data/mapHeaders/SaffronPokecenter.asm"
+INCLUDE "scripts/SaffronPokecenter.asm"
+INCLUDE "data/mapObjects/SaffronPokecenter.asm"
 
-INCLUDE "data/mapHeaders/viridianforestexit.asm"
-INCLUDE "scripts/viridianforestexit.asm"
-INCLUDE "data/mapObjects/viridianforestexit.asm"
+INCLUDE "data/mapHeaders/ViridianForestNorthGate.asm"
+INCLUDE "scripts/ViridianForestNorthGate.asm"
+INCLUDE "data/mapObjects/ViridianForestNorthGate.asm"
 
-INCLUDE "data/mapHeaders/route2gate.asm"
-INCLUDE "scripts/route2gate.asm"
-INCLUDE "data/mapObjects/route2gate.asm"
+INCLUDE "data/mapHeaders/Route2Gate.asm"
+INCLUDE "scripts/Route2Gate.asm"
+INCLUDE "data/mapObjects/Route2Gate.asm"
 
-INCLUDE "data/mapHeaders/viridianforestentrance.asm"
-INCLUDE "scripts/viridianforestentrance.asm"
-INCLUDE "data/mapObjects/viridianforestentrance.asm"
+INCLUDE "data/mapHeaders/ViridianForestSouthGate.asm"
+INCLUDE "scripts/ViridianForestSouthGate.asm"
+INCLUDE "data/mapObjects/ViridianForestSouthGate.asm"
 
-INCLUDE "data/mapHeaders/undergroundpathentranceroute5.asm"
-INCLUDE "scripts/undergroundpathentranceroute5.asm"
-INCLUDE "data/mapObjects/undergroundpathentranceroute5.asm"
+INCLUDE "data/mapHeaders/UndergroundPathRoute5.asm"
+INCLUDE "scripts/UndergroundPathRoute5.asm"
+INCLUDE "data/mapObjects/UndergroundPathRoute5.asm"
 
-INCLUDE "data/mapHeaders/undergroundpathentranceroute6.asm"
-INCLUDE "scripts/undergroundpathentranceroute6.asm"
-INCLUDE "data/mapObjects/undergroundpathentranceroute6.asm"
+INCLUDE "data/mapHeaders/UndergroundPathRoute6.asm"
+INCLUDE "scripts/UndergroundPathRoute6.asm"
+INCLUDE "data/mapObjects/UndergroundPathRoute6.asm"
 
-INCLUDE "data/mapHeaders/undergroundpathentranceroute7.asm"
-INCLUDE "scripts/undergroundpathentranceroute7.asm"
-INCLUDE "data/mapObjects/undergroundpathentranceroute7.asm"
+INCLUDE "data/mapHeaders/UndergroundPathRoute7.asm"
+INCLUDE "scripts/UndergroundPathRoute7.asm"
+INCLUDE "data/mapObjects/UndergroundPathRoute7.asm"
 
-INCLUDE "data/mapHeaders/undergroundpathentranceroute7copy.asm"
-INCLUDE "scripts/undergroundpathentranceroute7copy.asm"
-INCLUDE "data/mapObjects/undergroundpathentranceroute7copy.asm"
+INCLUDE "data/mapHeaders/UndergroundPathRoute7Copy.asm"
+INCLUDE "scripts/UndergroundPathRoute7Copy.asm"
+INCLUDE "data/mapObjects/UndergroundPathRoute7Copy.asm"
 
-INCLUDE "data/mapHeaders/silphco9.asm"
-INCLUDE "scripts/silphco9.asm"
-INCLUDE "data/mapObjects/silphco9.asm"
-SilphCo9Blocks: INCBIN "maps/silphco9.blk"
+INCLUDE "data/mapHeaders/SilphCo9F.asm"
+INCLUDE "scripts/SilphCo9F.asm"
+INCLUDE "data/mapObjects/SilphCo9F.asm"
+SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk"
 
-INCLUDE "data/mapHeaders/victoryroad1.asm"
-INCLUDE "scripts/victoryroad1.asm"
-INCLUDE "data/mapObjects/victoryroad1.asm"
-VictoryRoad1Blocks: INCBIN "maps/victoryroad1.blk"
+INCLUDE "data/mapHeaders/VictoryRoad1F.asm"
+INCLUDE "scripts/VictoryRoad1F.asm"
+INCLUDE "data/mapObjects/VictoryRoad1F.asm"
+VictoryRoad1F_Blocks: INCBIN "maps/VictoryRoad1F.blk"
 
 INCLUDE "engine/predefs17_2.asm"
 
@@ -1725,123 +1730,123 @@ INCLUDE "engine/hidden_object_functions17.asm"
 
 SECTION "bank18", ROMX
 
-ViridianForestBlocks:    INCBIN "maps/viridianforest.blk"
-UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk"
-UndergroundPathWEBlocks: INCBIN "maps/undergroundpathwe.blk"
+ViridianForest_Blocks: INCBIN "maps/ViridianForest.blk"
+UndergroundPathNorthSouth_Blocks: INCBIN "maps/UndergroundPathNorthSouth.blk"
+UndergroundPathWestEast_Blocks: INCBIN "maps/UndergroundPathWestEast.blk"
 
-	INCBIN "maps/unusedblocks60258.blk"
+	INCBIN "maps/UnusedDiglettsCaveCopy.blk"
 
-SSAnne10Blocks:
-SSAnne9Blocks: INCBIN "maps/ssanne9.blk"
+SSAnneB1FRooms_Blocks:
+SSAnne2FRooms_Blocks: INCBIN "maps/SSAnne2FRooms.blk"
 
-INCLUDE "data/mapHeaders/pokemontower1.asm"
-INCLUDE "scripts/pokemontower1.asm"
-INCLUDE "data/mapObjects/pokemontower1.asm"
-PokemonTower1Blocks: INCBIN "maps/pokemontower1.blk"
+INCLUDE "data/mapHeaders/PokemonTower1F.asm"
+INCLUDE "scripts/PokemonTower1F.asm"
+INCLUDE "data/mapObjects/PokemonTower1F.asm"
+PokemonTower1F_Blocks: INCBIN "maps/PokemonTower1F.blk"
 
-INCLUDE "data/mapHeaders/pokemontower2.asm"
-INCLUDE "scripts/pokemontower2.asm"
-INCLUDE "data/mapObjects/pokemontower2.asm"
-PokemonTower2Blocks: INCBIN "maps/pokemontower2.blk"
+INCLUDE "data/mapHeaders/PokemonTower2F.asm"
+INCLUDE "scripts/PokemonTower2F.asm"
+INCLUDE "data/mapObjects/PokemonTower2F.asm"
+PokemonTower2F_Blocks: INCBIN "maps/PokemonTower2F.blk"
 
-INCLUDE "data/mapHeaders/pokemontower3.asm"
-INCLUDE "scripts/pokemontower3.asm"
-INCLUDE "data/mapObjects/pokemontower3.asm"
-PokemonTower3Blocks: INCBIN "maps/pokemontower3.blk"
+INCLUDE "data/mapHeaders/PokemonTower3F.asm"
+INCLUDE "scripts/PokemonTower3F.asm"
+INCLUDE "data/mapObjects/PokemonTower3F.asm"
+PokemonTower3F_Blocks: INCBIN "maps/PokemonTower3F.blk"
 
-INCLUDE "data/mapHeaders/pokemontower4.asm"
-INCLUDE "scripts/pokemontower4.asm"
-INCLUDE "data/mapObjects/pokemontower4.asm"
-PokemonTower4Blocks: INCBIN "maps/pokemontower4.blk"
+INCLUDE "data/mapHeaders/PokemonTower4F.asm"
+INCLUDE "scripts/PokemonTower4F.asm"
+INCLUDE "data/mapObjects/PokemonTower4F.asm"
+PokemonTower4F_Blocks: INCBIN "maps/PokemonTower4F.blk"
 
-INCLUDE "data/mapHeaders/pokemontower5.asm"
-INCLUDE "scripts/pokemontower5.asm"
-INCLUDE "data/mapObjects/pokemontower5.asm"
-PokemonTower5Blocks: INCBIN "maps/pokemontower5.blk"
+INCLUDE "data/mapHeaders/PokemonTower5F.asm"
+INCLUDE "scripts/PokemonTower5F.asm"
+INCLUDE "data/mapObjects/PokemonTower5F.asm"
+PokemonTower5F_Blocks: INCBIN "maps/PokemonTower5F.blk"
 
-INCLUDE "data/mapHeaders/pokemontower6.asm"
-INCLUDE "scripts/pokemontower6.asm"
-INCLUDE "data/mapObjects/pokemontower6.asm"
-PokemonTower6Blocks: INCBIN "maps/pokemontower6.blk"
+INCLUDE "data/mapHeaders/PokemonTower6F.asm"
+INCLUDE "scripts/PokemonTower6F.asm"
+INCLUDE "data/mapObjects/PokemonTower6F.asm"
+PokemonTower6F_Blocks: INCBIN "maps/PokemonTower6F.blk"
 
-	INCBIN "maps/unusedblocks60cef.blk"
+	INCBIN "maps/UnusedEmptyMap.blk"
 
-INCLUDE "data/mapHeaders/pokemontower7.asm"
-INCLUDE "scripts/pokemontower7.asm"
-INCLUDE "data/mapObjects/pokemontower7.asm"
-PokemonTower7Blocks: INCBIN "maps/pokemontower7.blk"
+INCLUDE "data/mapHeaders/PokemonTower7F.asm"
+INCLUDE "scripts/PokemonTower7F.asm"
+INCLUDE "data/mapObjects/PokemonTower7F.asm"
+PokemonTower7F_Blocks: INCBIN "maps/PokemonTower7F.blk"
 
-INCLUDE "data/mapHeaders/celadonmart1.asm"
-INCLUDE "scripts/celadonmart1.asm"
-INCLUDE "data/mapObjects/celadonmart1.asm"
-CeladonMart1Blocks: INCBIN "maps/celadonmart1.blk"
+INCLUDE "data/mapHeaders/CeladonMart1F.asm"
+INCLUDE "scripts/CeladonMart1F.asm"
+INCLUDE "data/mapObjects/CeladonMart1F.asm"
+CeladonMart1F_Blocks: INCBIN "maps/CeladonMart1F.blk"
 
 INCLUDE "engine/overworld/cinnabar_lab.asm"
 
-INCLUDE "data/mapHeaders/viridianforest.asm"
-INCLUDE "scripts/viridianforest.asm"
-INCLUDE "data/mapObjects/viridianforest.asm"
+INCLUDE "data/mapHeaders/ViridianForest.asm"
+INCLUDE "scripts/ViridianForest.asm"
+INCLUDE "data/mapObjects/ViridianForest.asm"
 
-INCLUDE "data/mapHeaders/ssanne1.asm"
-INCLUDE "scripts/ssanne1.asm"
-INCLUDE "data/mapObjects/ssanne1.asm"
-SSAnne1Blocks: INCBIN "maps/ssanne1.blk"
+INCLUDE "data/mapHeaders/SSAnne1F.asm"
+INCLUDE "scripts/SSAnne1F.asm"
+INCLUDE "data/mapObjects/SSAnne1F.asm"
+SSAnne1F_Blocks: INCBIN "maps/SSAnne1F.blk"
 
-INCLUDE "data/mapHeaders/ssanne2.asm"
-INCLUDE "scripts/ssanne2.asm"
-INCLUDE "data/mapObjects/ssanne2.asm"
-SSAnne2Blocks: INCBIN "maps/ssanne2.blk"
+INCLUDE "data/mapHeaders/SSAnne2F.asm"
+INCLUDE "scripts/SSAnne2F.asm"
+INCLUDE "data/mapObjects/SSAnne2F.asm"
+SSAnne2F_Blocks: INCBIN "maps/SSAnne2F.blk"
 
-INCLUDE "data/mapHeaders/ssanne4.asm"
-INCLUDE "scripts/ssanne4.asm"
-INCLUDE "data/mapObjects/ssanne4.asm"
-SSAnne4Blocks: INCBIN "maps/ssanne4.blk"
+INCLUDE "data/mapHeaders/SSAnneB1F.asm"
+INCLUDE "scripts/SSAnneB1F.asm"
+INCLUDE "data/mapObjects/SSAnneB1F.asm"
+SSAnneB1F_Blocks: INCBIN "maps/SSAnneB1F.blk"
 
-INCLUDE "data/mapHeaders/ssanne5.asm"
-INCLUDE "scripts/ssanne5.asm"
-INCLUDE "data/mapObjects/ssanne5.asm"
-SSAnne5Blocks: INCBIN "maps/ssanne5.blk"
+INCLUDE "data/mapHeaders/SSAnneBow.asm"
+INCLUDE "scripts/SSAnneBow.asm"
+INCLUDE "data/mapObjects/SSAnneBow.asm"
+SSAnneBow_Blocks: INCBIN "maps/SSAnneBow.blk"
 
-INCLUDE "data/mapHeaders/ssanne6.asm"
-INCLUDE "scripts/ssanne6.asm"
-INCLUDE "data/mapObjects/ssanne6.asm"
-SSAnne6Blocks: INCBIN "maps/ssanne6.blk"
+INCLUDE "data/mapHeaders/SSAnneKitchen.asm"
+INCLUDE "scripts/SSAnneKitchen.asm"
+INCLUDE "data/mapObjects/SSAnneKitchen.asm"
+SSAnneKitchen_Blocks: INCBIN "maps/SSAnneKitchen.blk"
 
-INCLUDE "data/mapHeaders/ssanne7.asm"
-INCLUDE "scripts/ssanne7.asm"
-INCLUDE "data/mapObjects/ssanne7.asm"
-SSAnne7Blocks: INCBIN "maps/ssanne7.blk"
+INCLUDE "data/mapHeaders/SSAnneCaptainsRoom.asm"
+INCLUDE "scripts/SSAnneCaptainsRoom.asm"
+INCLUDE "data/mapObjects/SSAnneCaptainsRoom.asm"
+SSAnneCaptainsRoom_Blocks: INCBIN "maps/SSAnneCaptainsRoom.blk"
 
-INCLUDE "data/mapHeaders/ssanne8.asm"
-INCLUDE "scripts/ssanne8.asm"
-INCLUDE "data/mapObjects/ssanne8.asm"
-SSAnne8Blocks: INCBIN "maps/ssanne8.blk"
+INCLUDE "data/mapHeaders/SSAnne1FRooms.asm"
+INCLUDE "scripts/SSAnne1FRooms.asm"
+INCLUDE "data/mapObjects/SSAnne1FRooms.asm"
+SSAnne1FRooms_Blocks: INCBIN "maps/SSAnne1FRooms.blk"
 
-INCLUDE "data/mapHeaders/ssanne9.asm"
-INCLUDE "scripts/ssanne9.asm"
-INCLUDE "data/mapObjects/ssanne9.asm"
+INCLUDE "data/mapHeaders/SSAnne2FRooms.asm"
+INCLUDE "scripts/SSAnne2FRooms.asm"
+INCLUDE "data/mapObjects/SSAnne2FRooms.asm"
 
-INCLUDE "data/mapHeaders/ssanne10.asm"
-INCLUDE "scripts/ssanne10.asm"
-INCLUDE "data/mapObjects/ssanne10.asm"
+INCLUDE "data/mapHeaders/SSAnneB1FRooms.asm"
+INCLUDE "scripts/SSAnneB1FRooms.asm"
+INCLUDE "data/mapObjects/SSAnneB1FRooms.asm"
 
-INCLUDE "data/mapHeaders/undergroundpathns.asm"
-INCLUDE "scripts/undergroundpathns.asm"
-INCLUDE "data/mapObjects/undergroundpathns.asm"
+INCLUDE "data/mapHeaders/UndergroundPathNorthSouth.asm"
+INCLUDE "scripts/UndergroundPathNorthSouth.asm"
+INCLUDE "data/mapObjects/UndergroundPathNorthSouth.asm"
 
-INCLUDE "data/mapHeaders/undergroundpathwe.asm"
-INCLUDE "scripts/undergroundpathwe.asm"
-INCLUDE "data/mapObjects/undergroundpathwe.asm"
+INCLUDE "data/mapHeaders/UndergroundPathWestEast.asm"
+INCLUDE "scripts/UndergroundPathWestEast.asm"
+INCLUDE "data/mapObjects/UndergroundPathWestEast.asm"
 
-INCLUDE "data/mapHeaders/diglettscave.asm"
-INCLUDE "scripts/diglettscave.asm"
-INCLUDE "data/mapObjects/diglettscave.asm"
-DiglettsCaveBlocks: INCBIN "maps/diglettscave.blk"
+INCLUDE "data/mapHeaders/DiglettsCave.asm"
+INCLUDE "scripts/DiglettsCave.asm"
+INCLUDE "data/mapObjects/DiglettsCave.asm"
+DiglettsCave_Blocks: INCBIN "maps/DiglettsCave.blk"
 
-INCLUDE "data/mapHeaders/silphco11.asm"
-INCLUDE "scripts/silphco11.asm"
-INCLUDE "data/mapObjects/silphco11.asm"
-SilphCo11Blocks: INCBIN "maps/silphco11.blk"
+INCLUDE "data/mapHeaders/SilphCo11F.asm"
+INCLUDE "scripts/SilphCo11F.asm"
+INCLUDE "data/mapObjects/SilphCo11F.asm"
+SilphCo11F_Blocks: INCBIN "maps/SilphCo11F.blk"
 
 INCLUDE "engine/hidden_object_functions18.asm"
 
@@ -1903,6 +1908,7 @@ Forest_GFX:        INCBIN "gfx/tilesets/forest.2bpp"
 Forest_Block:      INCBIN "gfx/blocksets/forest.bst"
 Facility_GFX:      INCBIN "gfx/tilesets/facility.2bpp"
 Facility_Block:    INCBIN "gfx/blocksets/facility.bst"
+	ds 1
 
 
 SECTION "bank1B", ROMX
@@ -1940,17 +1946,17 @@ INCLUDE "engine/save.asm"
 
 SECTION "bank1D", ROMX
 
-CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk"
+CopycatsHouse1F_Blocks: INCBIN "maps/CopycatsHouse1F.blk"
 
-CinnabarMartBlocks:
-PewterMartBlocks: INCBIN "maps/pewtermart.blk"
+CinnabarMart_Blocks:
+PewterMart_Blocks: INCBIN "maps/PewterMart.blk"
 
-FuchsiaHouse1Blocks: INCBIN "maps/fuchsiahouse1.blk"
+FuchsiaBillsGrandpasHouse_Blocks: INCBIN "maps/FuchsiaBillsGrandpasHouse.blk"
 
-CinnabarPokecenterBlocks:
-FuchsiaPokecenterBlocks: INCBIN "maps/fuchsiapokecenter.blk"
+CinnabarPokecenter_Blocks:
+FuchsiaPokecenter_Blocks: INCBIN "maps/FuchsiaPokecenter.blk"
 
-CeruleanHouse2Blocks: INCBIN "maps/ceruleanhouse2.blk"
+CeruleanBadgeHouse_Blocks: INCBIN "maps/CeruleanBadgeHouse.blk"
 
 INCLUDE "engine/HoF_room_pc.asm"
 
@@ -1958,112 +1964,112 @@ INCLUDE "engine/status_ailments.asm"
 
 INCLUDE "engine/items/itemfinder.asm"
 
-INCLUDE "scripts/ceruleancity2.asm"
+INCLUDE "scripts/CeruleanCity_2.asm"
 
-INCLUDE "data/mapHeaders/viridiangym.asm"
-INCLUDE "scripts/viridiangym.asm"
-INCLUDE "data/mapObjects/viridiangym.asm"
-ViridianGymBlocks: INCBIN "maps/viridiangym.blk"
+INCLUDE "data/mapHeaders/ViridianGym.asm"
+INCLUDE "scripts/ViridianGym.asm"
+INCLUDE "data/mapObjects/ViridianGym.asm"
+ViridianGym_Blocks: INCBIN "maps/ViridianGym.blk"
 
-INCLUDE "data/mapHeaders/pewtermart.asm"
-INCLUDE "scripts/pewtermart.asm"
-INCLUDE "data/mapObjects/pewtermart.asm"
+INCLUDE "data/mapHeaders/PewterMart.asm"
+INCLUDE "scripts/PewterMart.asm"
+INCLUDE "data/mapObjects/PewterMart.asm"
 
-INCLUDE "data/mapHeaders/unknowndungeon1.asm"
-INCLUDE "scripts/unknowndungeon1.asm"
-INCLUDE "data/mapObjects/unknowndungeon1.asm"
-UnknownDungeon1Blocks: INCBIN "maps/unknowndungeon1.blk"
+INCLUDE "data/mapHeaders/CeruleanCave1F.asm"
+INCLUDE "scripts/CeruleanCave1F.asm"
+INCLUDE "data/mapObjects/CeruleanCave1F.asm"
+CeruleanCave1F_Blocks: INCBIN "maps/CeruleanCave1F.blk"
 
-INCLUDE "data/mapHeaders/ceruleanhouse2.asm"
-INCLUDE "scripts/ceruleanhouse2.asm"
-INCLUDE "data/mapObjects/ceruleanhouse2.asm"
+INCLUDE "data/mapHeaders/CeruleanBadgeHouse.asm"
+INCLUDE "scripts/CeruleanBadgeHouse.asm"
+INCLUDE "data/mapObjects/CeruleanBadgeHouse.asm"
 
 INCLUDE "engine/menu/vending_machine.asm"
 
-INCLUDE "data/mapHeaders/fuchsiahouse1.asm"
-INCLUDE "scripts/fuchsiahouse1.asm"
-INCLUDE "data/mapObjects/fuchsiahouse1.asm"
+INCLUDE "data/mapHeaders/FuchsiaBillsGrandpasHouse.asm"
+INCLUDE "scripts/FuchsiaBillsGrandpasHouse.asm"
+INCLUDE "data/mapObjects/FuchsiaBillsGrandpasHouse.asm"
 
-INCLUDE "data/mapHeaders/fuchsiapokecenter.asm"
-INCLUDE "scripts/fuchsiapokecenter.asm"
-INCLUDE "data/mapObjects/fuchsiapokecenter.asm"
+INCLUDE "data/mapHeaders/FuchsiaPokecenter.asm"
+INCLUDE "scripts/FuchsiaPokecenter.asm"
+INCLUDE "data/mapObjects/FuchsiaPokecenter.asm"
 
-INCLUDE "data/mapHeaders/fuchsiahouse2.asm"
-INCLUDE "scripts/fuchsiahouse2.asm"
-INCLUDE "data/mapObjects/fuchsiahouse2.asm"
-FuchsiaHouse2Blocks: INCBIN "maps/fuchsiahouse2.blk"
+INCLUDE "data/mapHeaders/WardensHouse.asm"
+INCLUDE "scripts/WardensHouse.asm"
+INCLUDE "data/mapObjects/WardensHouse.asm"
+WardensHouse_Blocks: INCBIN "maps/WardensHouse.blk"
 
-INCLUDE "data/mapHeaders/safarizoneentrance.asm"
-INCLUDE "scripts/safarizoneentrance.asm"
-INCLUDE "data/mapObjects/safarizoneentrance.asm"
-SafariZoneEntranceBlocks: INCBIN "maps/safarizoneentrance.blk"
+INCLUDE "data/mapHeaders/SafariZoneGate.asm"
+INCLUDE "scripts/SafariZoneGate.asm"
+INCLUDE "data/mapObjects/SafariZoneGate.asm"
+SafariZoneGate_Blocks: INCBIN "maps/SafariZoneGate.blk"
 
-INCLUDE "data/mapHeaders/fuchsiagym.asm"
-INCLUDE "scripts/fuchsiagym.asm"
-INCLUDE "data/mapObjects/fuchsiagym.asm"
-FuchsiaGymBlocks: INCBIN "maps/fuchsiagym.blk"
+INCLUDE "data/mapHeaders/FuchsiaGym.asm"
+INCLUDE "scripts/FuchsiaGym.asm"
+INCLUDE "data/mapObjects/FuchsiaGym.asm"
+FuchsiaGym_Blocks: INCBIN "maps/FuchsiaGym.blk"
 
-INCLUDE "data/mapHeaders/fuchsiameetingroom.asm"
-INCLUDE "scripts/fuchsiameetingroom.asm"
-INCLUDE "data/mapObjects/fuchsiameetingroom.asm"
-FuchsiaMeetingRoomBlocks: INCBIN "maps/fuchsiameetingroom.blk"
+INCLUDE "data/mapHeaders/FuchsiaMeetingRoom.asm"
+INCLUDE "scripts/FuchsiaMeetingRoom.asm"
+INCLUDE "data/mapObjects/FuchsiaMeetingRoom.asm"
+FuchsiaMeetingRoom_Blocks: INCBIN "maps/FuchsiaMeetingRoom.blk"
 
-INCLUDE "data/mapHeaders/cinnabargym.asm"
-INCLUDE "scripts/cinnabargym.asm"
-INCLUDE "data/mapObjects/cinnabargym.asm"
-CinnabarGymBlocks: INCBIN "maps/cinnabargym.blk"
+INCLUDE "data/mapHeaders/CinnabarGym.asm"
+INCLUDE "scripts/CinnabarGym.asm"
+INCLUDE "data/mapObjects/CinnabarGym.asm"
+CinnabarGym_Blocks: INCBIN "maps/CinnabarGym.blk"
 
-INCLUDE "data/mapHeaders/lab1.asm"
-INCLUDE "scripts/lab1.asm"
-INCLUDE "data/mapObjects/lab1.asm"
-Lab1Blocks: INCBIN "maps/lab1.blk"
+INCLUDE "data/mapHeaders/CinnabarLab.asm"
+INCLUDE "scripts/CinnabarLab.asm"
+INCLUDE "data/mapObjects/CinnabarLab.asm"
+CinnabarLab_Blocks: INCBIN "maps/CinnabarLab.blk"
 
-INCLUDE "data/mapHeaders/lab2.asm"
-INCLUDE "scripts/lab2.asm"
-INCLUDE "data/mapObjects/lab2.asm"
-Lab2Blocks: INCBIN "maps/lab2.blk"
+INCLUDE "data/mapHeaders/CinnabarLabTradeRoom.asm"
+INCLUDE "scripts/CinnabarLabTradeRoom.asm"
+INCLUDE "data/mapObjects/CinnabarLabTradeRoom.asm"
+CinnabarLabTradeRoom_Blocks: INCBIN "maps/CinnabarLabTradeRoom.blk"
 
-INCLUDE "data/mapHeaders/lab3.asm"
-INCLUDE "scripts/lab3.asm"
-INCLUDE "data/mapObjects/lab3.asm"
-Lab3Blocks: INCBIN "maps/lab3.blk"
+INCLUDE "data/mapHeaders/CinnabarLabMetronomeRoom.asm"
+INCLUDE "scripts/CinnabarLabMetronomeRoom.asm"
+INCLUDE "data/mapObjects/CinnabarLabMetronomeRoom.asm"
+CinnabarLabMetronomeRoom_Blocks: INCBIN "maps/CinnabarLabMetronomeRoom.blk"
 
-INCLUDE "data/mapHeaders/lab4.asm"
-INCLUDE "scripts/lab4.asm"
-INCLUDE "data/mapObjects/lab4.asm"
-Lab4Blocks: INCBIN "maps/lab4.blk"
+INCLUDE "data/mapHeaders/CinnabarLabFossilRoom.asm"
+INCLUDE "scripts/CinnabarLabFossilRoom.asm"
+INCLUDE "data/mapObjects/CinnabarLabFossilRoom.asm"
+CinnabarLabFossilRoom_Blocks: INCBIN "maps/CinnabarLabFossilRoom.blk"
 
-INCLUDE "data/mapHeaders/cinnabarpokecenter.asm"
-INCLUDE "scripts/cinnabarpokecenter.asm"
-INCLUDE "data/mapObjects/cinnabarpokecenter.asm"
+INCLUDE "data/mapHeaders/CinnabarPokecenter.asm"
+INCLUDE "scripts/CinnabarPokecenter.asm"
+INCLUDE "data/mapObjects/CinnabarPokecenter.asm"
 
-INCLUDE "data/mapHeaders/cinnabarmart.asm"
-INCLUDE "scripts/cinnabarmart.asm"
-INCLUDE "data/mapObjects/cinnabarmart.asm"
+INCLUDE "data/mapHeaders/CinnabarMart.asm"
+INCLUDE "scripts/CinnabarMart.asm"
+INCLUDE "data/mapObjects/CinnabarMart.asm"
 
-INCLUDE "data/mapHeaders/copycatshouse1f.asm"
-INCLUDE "scripts/copycatshouse1f.asm"
-INCLUDE "data/mapObjects/copycatshouse1f.asm"
+INCLUDE "data/mapHeaders/CopycatsHouse1F.asm"
+INCLUDE "scripts/CopycatsHouse1F.asm"
+INCLUDE "data/mapObjects/CopycatsHouse1F.asm"
 
-INCLUDE "data/mapHeaders/gary.asm"
-INCLUDE "scripts/gary.asm"
-INCLUDE "data/mapObjects/gary.asm"
-GaryBlocks: INCBIN "maps/gary.blk"
+INCLUDE "data/mapHeaders/ChampionsRoom.asm"
+INCLUDE "scripts/ChampionsRoom.asm"
+INCLUDE "data/mapObjects/ChampionsRoom.asm"
+ChampionsRoom_Blocks: INCBIN "maps/ChampionsRoom.blk"
 
-INCLUDE "data/mapHeaders/lorelei.asm"
-INCLUDE "scripts/lorelei.asm"
-INCLUDE "data/mapObjects/lorelei.asm"
-LoreleiBlocks: INCBIN "maps/lorelei.blk"
+INCLUDE "data/mapHeaders/LoreleisRoom.asm"
+INCLUDE "scripts/LoreleisRoom.asm"
+INCLUDE "data/mapObjects/LoreleisRoom.asm"
+LoreleisRoom_Blocks: INCBIN "maps/LoreleisRoom.blk"
 
-INCLUDE "data/mapHeaders/bruno.asm"
-INCLUDE "scripts/bruno.asm"
-INCLUDE "data/mapObjects/bruno.asm"
-BrunoBlocks: INCBIN "maps/bruno.blk"
+INCLUDE "data/mapHeaders/BrunosRoom.asm"
+INCLUDE "scripts/BrunosRoom.asm"
+INCLUDE "data/mapObjects/BrunosRoom.asm"
+BrunosRoom_Blocks: INCBIN "maps/BrunosRoom.blk"
 
-INCLUDE "data/mapHeaders/agatha.asm"
-INCLUDE "scripts/agatha.asm"
-INCLUDE "data/mapObjects/agatha.asm"
-AgathaBlocks: INCBIN "maps/agatha.blk"
+INCLUDE "data/mapHeaders/AgathasRoom.asm"
+INCLUDE "scripts/AgathasRoom.asm"
+INCLUDE "data/mapObjects/AgathasRoom.asm"
+AgathasRoom_Blocks: INCBIN "maps/AgathasRoom.blk"
 
 INCLUDE "engine/menu/league_pc.asm"
 
diff --git a/maps/agatha.blk b/maps/AgathasRoom.blk
index 4167fdc5..4167fdc5 100644
--- a/maps/agatha.blk
+++ b/maps/AgathasRoom.blk
diff --git a/maps/bikeshop.blk b/maps/BikeShop.blk
index 925be45c..925be45c 100644
--- a/maps/bikeshop.blk
+++ b/maps/BikeShop.blk
diff --git a/maps/billshouse.blk b/maps/BillsHouse.blk
index 112a2e81..112a2e81 100644
--- a/maps/billshouse.blk
+++ b/maps/BillsHouse.blk
diff --git a/maps/blueshouse.blk b/maps/BluesHouse.blk
index 823e6053..823e6053 100644
--- a/maps/blueshouse.blk
+++ b/maps/BluesHouse.blk
diff --git a/maps/bruno.blk b/maps/BrunosRoom.blk
index 2ecc677e..2ecc677e 100644
--- a/maps/bruno.blk
+++ b/maps/BrunosRoom.blk
diff --git a/maps/celadonhouse.blk b/maps/CeladonChiefHouse.blk
index 4181d9de..4181d9de 100644
--- a/maps/celadonhouse.blk
+++ b/maps/CeladonChiefHouse.blk
diff --git a/maps/celadoncity.blk b/maps/CeladonCity.blk
index f1fce6bc..f1fce6bc 100644
--- a/maps/celadoncity.blk
+++ b/maps/CeladonCity.blk
diff --git a/maps/celadondiner.blk b/maps/CeladonDiner.blk
index 4ef657b9..4ef657b9 100644
--- a/maps/celadondiner.blk
+++ b/maps/CeladonDiner.blk
diff --git a/maps/celadongym.blk b/maps/CeladonGym.blk
index dcecc50c..dcecc50c 100644
--- a/maps/celadongym.blk
+++ b/maps/CeladonGym.blk
diff --git a/maps/celadonhotel.blk b/maps/CeladonHotel.blk
index 07a8b781..07a8b781 100644
--- a/maps/celadonhotel.blk
+++ b/maps/CeladonHotel.blk
diff --git a/maps/celadonmansion1.blk b/maps/CeladonMansion1F.blk
index 97a1a91f..97a1a91f 100644
--- a/maps/celadonmansion1.blk
+++ b/maps/CeladonMansion1F.blk
diff --git a/maps/celadonmansion2.blk b/maps/CeladonMansion2F.blk
index 920282c1..920282c1 100644
--- a/maps/celadonmansion2.blk
+++ b/maps/CeladonMansion2F.blk
diff --git a/maps/celadonmansion3.blk b/maps/CeladonMansion3F.blk
index 5451ea7d..5451ea7d 100644
--- a/maps/celadonmansion3.blk
+++ b/maps/CeladonMansion3F.blk
diff --git a/maps/celadonmansion4.blk b/maps/CeladonMansionRoof.blk
index dafad3db..dafad3db 100644
--- a/maps/celadonmansion4.blk
+++ b/maps/CeladonMansionRoof.blk
diff --git a/maps/celadonmansion5.blk b/maps/CeladonMansionRoofHouse.blk
index 51bf8401..51bf8401 100644
--- a/maps/celadonmansion5.blk
+++ b/maps/CeladonMansionRoofHouse.blk
diff --git a/maps/celadonmart1.blk b/maps/CeladonMart1F.blk
index 0c805e4c..0c805e4c 100644
--- a/maps/celadonmart1.blk
+++ b/maps/CeladonMart1F.blk
diff --git a/maps/celadonmart2.blk b/maps/CeladonMart2F.blk
index 4ddd4f4b..4ddd4f4b 100644
--- a/maps/celadonmart2.blk
+++ b/maps/CeladonMart2F.blk
diff --git a/maps/celadonmart3.blk b/maps/CeladonMart3F.blk
index 3be70750..3be70750 100644
--- a/maps/celadonmart3.blk
+++ b/maps/CeladonMart3F.blk
diff --git a/maps/celadonmart4.blk b/maps/CeladonMart4F.blk
index 2066e69e..2066e69e 100644
--- a/maps/celadonmart4.blk
+++ b/maps/CeladonMart4F.blk
diff --git a/maps/celadonmart5.blk b/maps/CeladonMart5F.blk
index 8558b3de..8558b3de 100644
--- a/maps/celadonmart5.blk
+++ b/maps/CeladonMart5F.blk
diff --git a/maps/celadonmartelevator.blk b/maps/CeladonMartElevator.blk
index 824bc3de..824bc3de 100644
--- a/maps/celadonmartelevator.blk
+++ b/maps/CeladonMartElevator.blk
diff --git a/maps/celadonmartroof.blk b/maps/CeladonMartRoof.blk
index 520407ba..520407ba 100644
--- a/maps/celadonmartroof.blk
+++ b/maps/CeladonMartRoof.blk
diff --git a/maps/celadonpokecenter.blk b/maps/CeladonPokecenter.blk
index 9641efe4..9641efe4 100644
--- a/maps/celadonpokecenter.blk
+++ b/maps/CeladonPokecenter.blk
diff --git a/maps/ceruleanhouse2.blk b/maps/CeruleanBadgeHouse.blk
index 35443909..35443909 100644
--- a/maps/ceruleanhouse2.blk
+++ b/maps/CeruleanBadgeHouse.blk
diff --git a/maps/unknowndungeon1.blk b/maps/CeruleanCave1F.blk
index 574613af..574613af 100644
--- a/maps/unknowndungeon1.blk
+++ b/maps/CeruleanCave1F.blk
diff --git a/maps/unknowndungeon2.blk b/maps/CeruleanCave2F.blk
index 6eb27eee..6eb27eee 100644
--- a/maps/unknowndungeon2.blk
+++ b/maps/CeruleanCave2F.blk
diff --git a/maps/unknowndungeon3.blk b/maps/CeruleanCaveB1F.blk
index 858f0529..858f0529 100644
--- a/maps/unknowndungeon3.blk
+++ b/maps/CeruleanCaveB1F.blk
diff --git a/maps/ceruleancity.blk b/maps/CeruleanCity.blk
index d7abfd3d..d7abfd3d 100644
--- a/maps/ceruleancity.blk
+++ b/maps/CeruleanCity.blk
diff --git a/maps/ceruleangym.blk b/maps/CeruleanGym.blk
index c5a3eab2..c5a3eab2 100644
--- a/maps/ceruleangym.blk
+++ b/maps/CeruleanGym.blk
diff --git a/maps/ceruleanmart.blk b/maps/CeruleanMart.blk
index 1da8fffc..1da8fffc 100644
--- a/maps/ceruleanmart.blk
+++ b/maps/CeruleanMart.blk
diff --git a/maps/ceruleanpokecenter.blk b/maps/CeruleanPokecenter.blk
index 9641efe4..9641efe4 100644
--- a/maps/ceruleanpokecenter.blk
+++ b/maps/CeruleanPokecenter.blk
diff --git a/maps/ceruleanhouse1.blk b/maps/CeruleanTradeHouse.blk
index 823e6053..823e6053 100644
--- a/maps/ceruleanhouse1.blk
+++ b/maps/CeruleanTradeHouse.blk
diff --git a/maps/ceruleanhousetrashed.blk b/maps/CeruleanTrashedHouse.blk
index cbc77e74..cbc77e74 100644
--- a/maps/ceruleanhousetrashed.blk
+++ b/maps/CeruleanTrashedHouse.blk
diff --git a/maps/gary.blk b/maps/ChampionsRoom.blk
index 8e5d10d0..8e5d10d0 100644
--- a/maps/gary.blk
+++ b/maps/ChampionsRoom.blk
diff --git a/maps/cinnabargym.blk b/maps/CinnabarGym.blk
index ab8de94a..ab8de94a 100644
--- a/maps/cinnabargym.blk
+++ b/maps/CinnabarGym.blk
diff --git a/maps/cinnabarisland.blk b/maps/CinnabarIsland.blk
index 1a7922c9..1a7922c9 100644
--- a/maps/cinnabarisland.blk
+++ b/maps/CinnabarIsland.blk
diff --git a/maps/lab1.blk b/maps/CinnabarLab.blk
index 7a6502a2..7a6502a2 100644
--- a/maps/lab1.blk
+++ b/maps/CinnabarLab.blk
diff --git a/maps/lab4.blk b/maps/CinnabarLabFossilRoom.blk
index d9a64a5d..d9a64a5d 100644
--- a/maps/lab4.blk
+++ b/maps/CinnabarLabFossilRoom.blk
diff --git a/maps/lab3.blk b/maps/CinnabarLabMetronomeRoom.blk
index 822db175..822db175 100644
--- a/maps/lab3.blk
+++ b/maps/CinnabarLabMetronomeRoom.blk
diff --git a/maps/lab2.blk b/maps/CinnabarLabTradeRoom.blk
index ef77b656..ef77b656 100644
--- a/maps/lab2.blk
+++ b/maps/CinnabarLabTradeRoom.blk
diff --git a/maps/cinnabarmart.blk b/maps/CinnabarMart.blk
index 1da8fffc..1da8fffc 100644
--- a/maps/cinnabarmart.blk
+++ b/maps/CinnabarMart.blk
diff --git a/maps/cinnabarpokecenter.blk b/maps/CinnabarPokecenter.blk
index 9641efe4..9641efe4 100644
--- a/maps/cinnabarpokecenter.blk
+++ b/maps/CinnabarPokecenter.blk
diff --git a/maps/colosseum.blk b/maps/Colosseum.blk
index d05a5b43..d05a5b43 100644
--- a/maps/colosseum.blk
+++ b/maps/Colosseum.blk
diff --git a/maps/copycatshouse1f.blk b/maps/CopycatsHouse1F.blk
index 1b7d4f07..1b7d4f07 100644
--- a/maps/copycatshouse1f.blk
+++ b/maps/CopycatsHouse1F.blk
diff --git a/maps/copycatshouse2f.blk b/maps/CopycatsHouse2F.blk
index dd9d1ea4..dd9d1ea4 100644
--- a/maps/copycatshouse2f.blk
+++ b/maps/CopycatsHouse2F.blk
diff --git a/maps/daycarem.blk b/maps/Daycare.blk
index 823e6053..823e6053 100644
--- a/maps/daycarem.blk
+++ b/maps/Daycare.blk
diff --git a/maps/diglettscave.blk b/maps/DiglettsCave.blk
index ff81fc7d..ff81fc7d 100644
--- a/maps/diglettscave.blk
+++ b/maps/DiglettsCave.blk
diff --git a/maps/diglettscaveentranceroute11.blk b/maps/DiglettsCaveRoute11.blk
index 5282c7dd..5282c7dd 100644
--- a/maps/diglettscaveentranceroute11.blk
+++ b/maps/DiglettsCaveRoute11.blk
diff --git a/maps/diglettscaveroute2.blk b/maps/DiglettsCaveRoute2.blk
index 5282c7dd..5282c7dd 100644
--- a/maps/diglettscaveroute2.blk
+++ b/maps/DiglettsCaveRoute2.blk
diff --git a/maps/fightingdojo.blk b/maps/FightingDojo.blk
index 3b13cc90..3b13cc90 100644
--- a/maps/fightingdojo.blk
+++ b/maps/FightingDojo.blk
diff --git a/maps/fuchsiahouse1.blk b/maps/FuchsiaBillsGrandpasHouse.blk
index 823e6053..823e6053 100644
--- a/maps/fuchsiahouse1.blk
+++ b/maps/FuchsiaBillsGrandpasHouse.blk
diff --git a/maps/fuchsiacity.blk b/maps/FuchsiaCity.blk
index e57addb1..e57addb1 100644
--- a/maps/fuchsiacity.blk
+++ b/maps/FuchsiaCity.blk
diff --git a/maps/fuchsiahouse3.blk b/maps/FuchsiaGoodRodHouse.blk
index 35443909..35443909 100644
--- a/maps/fuchsiahouse3.blk
+++ b/maps/FuchsiaGoodRodHouse.blk
diff --git a/maps/fuchsiagym.blk b/maps/FuchsiaGym.blk
index dd4f5019..dd4f5019 100644
--- a/maps/fuchsiagym.blk
+++ b/maps/FuchsiaGym.blk
diff --git a/maps/fuchsiamart.blk b/maps/FuchsiaMart.blk
index 1da8fffc..1da8fffc 100644
--- a/maps/fuchsiamart.blk
+++ b/maps/FuchsiaMart.blk
diff --git a/maps/fuchsiameetingroom.blk b/maps/FuchsiaMeetingRoom.blk
index a1c8d921..a1c8d921 100644
--- a/maps/fuchsiameetingroom.blk
+++ b/maps/FuchsiaMeetingRoom.blk
diff --git a/maps/fuchsiapokecenter.blk b/maps/FuchsiaPokecenter.blk
index 9641efe4..9641efe4 100644
--- a/maps/fuchsiapokecenter.blk
+++ b/maps/FuchsiaPokecenter.blk
diff --git a/maps/celadongamecorner.blk b/maps/GameCorner.blk
index 82fd0b61..82fd0b61 100644
--- a/maps/celadongamecorner.blk
+++ b/maps/GameCorner.blk
diff --git a/maps/celadonprizeroom.blk b/maps/GameCornerPrizeRoom.blk
index f0a6c058..f0a6c058 100644
--- a/maps/celadonprizeroom.blk
+++ b/maps/GameCornerPrizeRoom.blk
diff --git a/maps/halloffameroom.blk b/maps/HallOfFame.blk
index f1aa64a4..f1aa64a4 100644
--- a/maps/halloffameroom.blk
+++ b/maps/HallOfFame.blk
diff --git a/maps/indigoplateau.blk b/maps/IndigoPlateau.blk
index a850b3c6..a850b3c6 100644
--- a/maps/indigoplateau.blk
+++ b/maps/IndigoPlateau.blk
diff --git a/maps/indigoplateaulobby.blk b/maps/IndigoPlateauLobby.blk
index 38561b84..38561b84 100644
--- a/maps/indigoplateaulobby.blk
+++ b/maps/IndigoPlateauLobby.blk
diff --git a/maps/lance.blk b/maps/LancesRoom.blk
index b05f1c35..b05f1c35 100644
--- a/maps/lance.blk
+++ b/maps/LancesRoom.blk
diff --git a/maps/lavenderhouse1.blk b/maps/LavenderCuboneHouse.blk
index 823e6053..823e6053 100644
--- a/maps/lavenderhouse1.blk
+++ b/maps/LavenderCuboneHouse.blk
diff --git a/maps/lavendermart.blk b/maps/LavenderMart.blk
index 1da8fffc..1da8fffc 100644
--- a/maps/lavendermart.blk
+++ b/maps/LavenderMart.blk
diff --git a/maps/lavenderpokecenter.blk b/maps/LavenderPokecenter.blk
index 9641efe4..9641efe4 100644
--- a/maps/lavenderpokecenter.blk
+++ b/maps/LavenderPokecenter.blk
diff --git a/maps/lavendertown.blk b/maps/LavenderTown.blk
index d094f3b9..d094f3b9 100644
--- a/maps/lavendertown.blk
+++ b/maps/LavenderTown.blk
diff --git a/maps/lorelei.blk b/maps/LoreleisRoom.blk
index 8df8e929..8df8e929 100644
--- a/maps/lorelei.blk
+++ b/maps/LoreleisRoom.blk
diff --git a/maps/lavenderhouse2.blk b/maps/MrFujisHouse.blk
index 823e6053..823e6053 100644
--- a/maps/lavenderhouse2.blk
+++ b/maps/MrFujisHouse.blk
diff --git a/maps/namerater.blk b/maps/MrPsychicsHouse.blk
index 823e6053..823e6053 100644
--- a/maps/namerater.blk
+++ b/maps/MrPsychicsHouse.blk
diff --git a/maps/mtmoon1.blk b/maps/MtMoon1F.blk
index 04edbba7..04edbba7 100644
--- a/maps/mtmoon1.blk
+++ b/maps/MtMoon1F.blk
diff --git a/maps/mtmoon2.blk b/maps/MtMoonB1F.blk
index ee1aa030..ee1aa030 100644
--- a/maps/mtmoon2.blk
+++ b/maps/MtMoonB1F.blk
diff --git a/maps/mtmoon3.blk b/maps/MtMoonB2F.blk
index 216fe705..216fe705 100644
--- a/maps/mtmoon3.blk
+++ b/maps/MtMoonB2F.blk
diff --git a/maps/mtmoonpokecenter.blk b/maps/MtMoonPokecenter.blk
index 9641efe4..9641efe4 100644
--- a/maps/mtmoonpokecenter.blk
+++ b/maps/MtMoonPokecenter.blk
diff --git a/maps/museum1f.blk b/maps/Museum1F.blk
index a96771ba..a96771ba 100644
--- a/maps/museum1f.blk
+++ b/maps/Museum1F.blk
diff --git a/maps/museum2f.blk b/maps/Museum2F.blk
index 355e5d80..355e5d80 100644
--- a/maps/museum2f.blk
+++ b/maps/Museum2F.blk
diff --git a/maps/pewterhouse1.blk b/maps/NameRatersHouse.blk
index 823e6053..823e6053 100644
--- a/maps/pewterhouse1.blk
+++ b/maps/NameRatersHouse.blk
diff --git a/maps/oakslab.blk b/maps/OaksLab.blk
index 64d2d6a2..64d2d6a2 100644
--- a/maps/oakslab.blk
+++ b/maps/OaksLab.blk
diff --git a/maps/pallettown.blk b/maps/PalletTown.blk
index 64e5b9cc..64e5b9cc 100644
--- a/maps/pallettown.blk
+++ b/maps/PalletTown.blk
diff --git a/maps/pewtercity.blk b/maps/PewterCity.blk
index b199480b..b199480b 100644
--- a/maps/pewtercity.blk
+++ b/maps/PewterCity.blk
diff --git a/maps/pewtergym.blk b/maps/PewterGym.blk
index e7fc2212..e7fc2212 100644
--- a/maps/pewtergym.blk
+++ b/maps/PewterGym.blk
diff --git a/maps/pewtermart.blk b/maps/PewterMart.blk
index 1da8fffc..1da8fffc 100644
--- a/maps/pewtermart.blk
+++ b/maps/PewterMart.blk
diff --git a/maps/pewterhouse2.blk b/maps/PewterNidoranHouse.blk
index 823e6053..823e6053 100644
--- a/maps/pewterhouse2.blk
+++ b/maps/PewterNidoranHouse.blk
diff --git a/maps/pewterpokecenter.blk b/maps/PewterPokecenter.blk
index 9641efe4..9641efe4 100644
--- a/maps/pewterpokecenter.blk
+++ b/maps/PewterPokecenter.blk
diff --git a/maps/route12house.blk b/maps/PewterSpeechHouse.blk
index 823e6053..823e6053 100644
--- a/maps/route12house.blk
+++ b/maps/PewterSpeechHouse.blk
diff --git a/maps/fanclub.blk b/maps/PokemonFanClub.blk
index 2622e175..2622e175 100644
--- a/maps/fanclub.blk
+++ b/maps/PokemonFanClub.blk
diff --git a/maps/mansion1.blk b/maps/PokemonMansion1F.blk
index afcb8e7e..afcb8e7e 100644
--- a/maps/mansion1.blk
+++ b/maps/PokemonMansion1F.blk
diff --git a/maps/mansion2.blk b/maps/PokemonMansion2F.blk
index 37896766..37896766 100644
--- a/maps/mansion2.blk
+++ b/maps/PokemonMansion2F.blk
diff --git a/maps/mansion3.blk b/maps/PokemonMansion3F.blk
index 1a86bc71..1a86bc71 100644
--- a/maps/mansion3.blk
+++ b/maps/PokemonMansion3F.blk
diff --git a/maps/mansion4.blk b/maps/PokemonMansionB1F.blk
index 9ced2192..9ced2192 100644
--- a/maps/mansion4.blk
+++ b/maps/PokemonMansionB1F.blk
diff --git a/maps/pokemontower1.blk b/maps/PokemonTower1F.blk
index 25afe15f..25afe15f 100644
--- a/maps/pokemontower1.blk
+++ b/maps/PokemonTower1F.blk
diff --git a/maps/pokemontower2.blk b/maps/PokemonTower2F.blk
index c8acf99d..c8acf99d 100644
--- a/maps/pokemontower2.blk
+++ b/maps/PokemonTower2F.blk
diff --git a/maps/pokemontower3.blk b/maps/PokemonTower3F.blk
index 26d28b79..26d28b79 100644
--- a/maps/pokemontower3.blk
+++ b/maps/PokemonTower3F.blk
diff --git a/maps/pokemontower4.blk b/maps/PokemonTower4F.blk
index 2df4ab1a..2df4ab1a 100644
--- a/maps/pokemontower4.blk
+++ b/maps/PokemonTower4F.blk
diff --git a/maps/pokemontower5.blk b/maps/PokemonTower5F.blk
index a05a575c..a05a575c 100644
--- a/maps/pokemontower5.blk
+++ b/maps/PokemonTower5F.blk
diff --git a/maps/pokemontower6.blk b/maps/PokemonTower6F.blk
index 7256a841..7256a841 100644
--- a/maps/pokemontower6.blk
+++ b/maps/PokemonTower6F.blk
diff --git a/maps/pokemontower7.blk b/maps/PokemonTower7F.blk
index 4598f336..4598f336 100644
--- a/maps/pokemontower7.blk
+++ b/maps/PokemonTower7F.blk
diff --git a/maps/powerplant.blk b/maps/PowerPlant.blk
index 7f2d7eeb..7f2d7eeb 100644
--- a/maps/powerplant.blk
+++ b/maps/PowerPlant.blk
diff --git a/maps/redshouse1f.blk b/maps/RedsHouse1F.blk
index 1b7d4f07..1b7d4f07 100644
--- a/maps/redshouse1f.blk
+++ b/maps/RedsHouse1F.blk
diff --git a/maps/redshouse2f.blk b/maps/RedsHouse2F.blk
index dd9d1ea4..dd9d1ea4 100644
--- a/maps/redshouse2f.blk
+++ b/maps/RedsHouse2F.blk
diff --git a/maps/rocktunnel1.blk b/maps/RockTunnel1F.blk
index bbd18ce6..bbd18ce6 100644
--- a/maps/rocktunnel1.blk
+++ b/maps/RockTunnel1F.blk
diff --git a/maps/rocktunnel2.blk b/maps/RockTunnelB1F.blk
index a579831b..a579831b 100644
--- a/maps/rocktunnel2.blk
+++ b/maps/RockTunnelB1F.blk
diff --git a/maps/rocktunnelpokecenter.blk b/maps/RockTunnelPokecenter.blk
index 9641efe4..9641efe4 100644
--- a/maps/rocktunnelpokecenter.blk
+++ b/maps/RockTunnelPokecenter.blk
diff --git a/maps/rockethideout1.blk b/maps/RocketHideoutB1F.blk
index 18b02211..18b02211 100644
--- a/maps/rockethideout1.blk
+++ b/maps/RocketHideoutB1F.blk
diff --git a/maps/rockethideout2.blk b/maps/RocketHideoutB2F.blk
index b8fc41f8..b8fc41f8 100644
--- a/maps/rockethideout2.blk
+++ b/maps/RocketHideoutB2F.blk
diff --git a/maps/rockethideout3.blk b/maps/RocketHideoutB3F.blk
index 23b45286..23b45286 100644
--- a/maps/rockethideout3.blk
+++ b/maps/RocketHideoutB3F.blk
diff --git a/maps/rockethideout4.blk b/maps/RocketHideoutB4F.blk
index 389c1c7c..389c1c7c 100644
--- a/maps/rockethideout4.blk
+++ b/maps/RocketHideoutB4F.blk
diff --git a/maps/rockethideoutelevator.blk b/maps/RocketHideoutElevator.blk
index 0c296a34..0c296a34 100644
--- a/maps/rockethideoutelevator.blk
+++ b/maps/RocketHideoutElevator.blk
diff --git a/maps/route1.blk b/maps/Route1.blk
index 56a9e4a3..56a9e4a3 100644
--- a/maps/route1.blk
+++ b/maps/Route1.blk
diff --git a/maps/route10.blk b/maps/Route10.blk
index aed525c5..aed525c5 100644
--- a/maps/route10.blk
+++ b/maps/Route10.blk
diff --git a/maps/route11.blk b/maps/Route11.blk
index c026d913..c026d913 100644
--- a/maps/route11.blk
+++ b/maps/Route11.blk
diff --git a/maps/route11gate.blk b/maps/Route11Gate1F.blk
index d1a18368..d1a18368 100644
--- a/maps/route11gate.blk
+++ b/maps/Route11Gate1F.blk
diff --git a/maps/route11gateupstairs.blk b/maps/Route11Gate2F.blk
index f90c7db9..f90c7db9 100644
--- a/maps/route11gateupstairs.blk
+++ b/maps/Route11Gate2F.blk
diff --git a/maps/route12.blk b/maps/Route12.blk
index d79f59e3..d79f59e3 100644
--- a/maps/route12.blk
+++ b/maps/Route12.blk
diff --git a/maps/route12gate.blk b/maps/Route12Gate1F.blk
index 5c626eaf..5c626eaf 100644
--- a/maps/route12gate.blk
+++ b/maps/Route12Gate1F.blk
diff --git a/maps/route12gateupstairs.blk b/maps/Route12Gate2F.blk
index f90c7db9..f90c7db9 100644
--- a/maps/route12gateupstairs.blk
+++ b/maps/Route12Gate2F.blk
diff --git a/maps/route16house.blk b/maps/Route12SuperRodHouse.blk
index 823e6053..823e6053 100644
--- a/maps/route16house.blk
+++ b/maps/Route12SuperRodHouse.blk
diff --git a/maps/route13.blk b/maps/Route13.blk
index 9d607b6d..9d607b6d 100644
--- a/maps/route13.blk
+++ b/maps/Route13.blk
diff --git a/maps/route14.blk b/maps/Route14.blk
index 38cae243..38cae243 100644
--- a/maps/route14.blk
+++ b/maps/Route14.blk
diff --git a/maps/route15.blk b/maps/Route15.blk
index 77a33889..77a33889 100644
--- a/maps/route15.blk
+++ b/maps/Route15.blk
diff --git a/maps/route15gate.blk b/maps/Route15Gate1F.blk
index d1a18368..d1a18368 100644
--- a/maps/route15gate.blk
+++ b/maps/Route15Gate1F.blk
diff --git a/maps/route15gateupstairs.blk b/maps/Route15Gate2F.blk
index f90c7db9..f90c7db9 100755
--- a/maps/route15gateupstairs.blk
+++ b/maps/Route15Gate2F.blk
diff --git a/maps/route16.blk b/maps/Route16.blk
index d3a7d5e5..d3a7d5e5 100644
--- a/maps/route16.blk
+++ b/maps/Route16.blk
diff --git a/maps/route2house.blk b/maps/Route16FlyHouse.blk
index 823e6053..823e6053 100644
--- a/maps/route2house.blk
+++ b/maps/Route16FlyHouse.blk
diff --git a/maps/route16gate.blk b/maps/Route16Gate1F.blk
index 9cd90e33..9cd90e33 100644
--- a/maps/route16gate.blk
+++ b/maps/Route16Gate1F.blk
diff --git a/maps/route16gateupstairs.blk b/maps/Route16Gate2F.blk
index f90c7db9..f90c7db9 100644
--- a/maps/route16gateupstairs.blk
+++ b/maps/Route16Gate2F.blk
diff --git a/maps/route17.blk b/maps/Route17.blk
index 2a27af66..2a27af66 100644
--- a/maps/route17.blk
+++ b/maps/Route17.blk
diff --git a/maps/route18.blk b/maps/Route18.blk
index aeb83516..aeb83516 100644
--- a/maps/route18.blk
+++ b/maps/Route18.blk
diff --git a/maps/route18gate.blk b/maps/Route18Gate1F.blk
index d1a18368..d1a18368 100644
--- a/maps/route18gate.blk
+++ b/maps/Route18Gate1F.blk
diff --git a/maps/route18gateupstairs.blk b/maps/Route18Gate2F.blk
index f90c7db9..f90c7db9 100644
--- a/maps/route18gateupstairs.blk
+++ b/maps/Route18Gate2F.blk
diff --git a/maps/route19.blk b/maps/Route19.blk
index 0bd469e7..0bd469e7 100644
--- a/maps/route19.blk
+++ b/maps/Route19.blk
diff --git a/maps/route2.blk b/maps/Route2.blk
index dd6227fd..dd6227fd 100644
--- a/maps/route2.blk
+++ b/maps/Route2.blk
diff --git a/maps/route20.blk b/maps/Route20.blk
index aae6a458..aae6a458 100644
--- a/maps/route20.blk
+++ b/maps/Route20.blk
diff --git a/maps/route21.blk b/maps/Route21.blk
index fa1f5b79..fa1f5b79 100644
--- a/maps/route21.blk
+++ b/maps/Route21.blk
diff --git a/maps/route22.blk b/maps/Route22.blk
index 231c6838..231c6838 100644
--- a/maps/route22.blk
+++ b/maps/Route22.blk
diff --git a/maps/route22gate.blk b/maps/Route22Gate.blk
index 9cdf5b28..9cdf5b28 100644
--- a/maps/route22gate.blk
+++ b/maps/Route22Gate.blk
diff --git a/maps/route23.blk b/maps/Route23.blk
index 1ecf1d1a..1ecf1d1a 100644
--- a/maps/route23.blk
+++ b/maps/Route23.blk
diff --git a/maps/route24.blk b/maps/Route24.blk
index 21de9390..21de9390 100644
--- a/maps/route24.blk
+++ b/maps/Route24.blk
diff --git a/maps/route25.blk b/maps/Route25.blk
index 49c98815..49c98815 100644
--- a/maps/route25.blk
+++ b/maps/Route25.blk
diff --git a/maps/route2gate.blk b/maps/Route2Gate.blk
index 19af9540..19af9540 100644
--- a/maps/route2gate.blk
+++ b/maps/Route2Gate.blk
diff --git a/maps/saffronhouse1.blk b/maps/Route2TradeHouse.blk
index 823e6053..823e6053 100644
--- a/maps/saffronhouse1.blk
+++ b/maps/Route2TradeHouse.blk
diff --git a/maps/route3.blk b/maps/Route3.blk
index a5284350..a5284350 100644
--- a/maps/route3.blk
+++ b/maps/Route3.blk
diff --git a/maps/route4.blk b/maps/Route4.blk
index cb6a6a74..cb6a6a74 100644
--- a/maps/route4.blk
+++ b/maps/Route4.blk
diff --git a/maps/route5.blk b/maps/Route5.blk
index 224a5b4b..224a5b4b 100644
--- a/maps/route5.blk
+++ b/maps/Route5.blk
diff --git a/maps/route5gate.blk b/maps/Route5Gate.blk
index f69dfa87..f69dfa87 100644
--- a/maps/route5gate.blk
+++ b/maps/Route5Gate.blk
diff --git a/maps/route6.blk b/maps/Route6.blk
index b488b37b..b488b37b 100644
--- a/maps/route6.blk
+++ b/maps/Route6.blk
diff --git a/maps/route6gate.blk b/maps/Route6Gate.blk
index f69dfa87..f69dfa87 100644
--- a/maps/route6gate.blk
+++ b/maps/Route6Gate.blk
diff --git a/maps/route7.blk b/maps/Route7.blk
index 1e58b2f8..1e58b2f8 100644
--- a/maps/route7.blk
+++ b/maps/Route7.blk
diff --git a/maps/route7gate.blk b/maps/Route7Gate.blk
index 79911bdc..79911bdc 100644
--- a/maps/route7gate.blk
+++ b/maps/Route7Gate.blk
diff --git a/maps/route8.blk b/maps/Route8.blk
index 8a9da3d9..8a9da3d9 100644
--- a/maps/route8.blk
+++ b/maps/Route8.blk
diff --git a/maps/route8gate.blk b/maps/Route8Gate.blk
index 79911bdc..79911bdc 100644
--- a/maps/route8gate.blk
+++ b/maps/Route8Gate.blk
diff --git a/maps/route9.blk b/maps/Route9.blk
index e1ebe7cb..e1ebe7cb 100644
--- a/maps/route9.blk
+++ b/maps/Route9.blk
diff --git a/maps/ssanne1.blk b/maps/SSAnne1F.blk
index fd236973..fd236973 100644
--- a/maps/ssanne1.blk
+++ b/maps/SSAnne1F.blk
diff --git a/maps/ssanne8.blk b/maps/SSAnne1FRooms.blk
index 1749e638..1749e638 100644
--- a/maps/ssanne8.blk
+++ b/maps/SSAnne1FRooms.blk
diff --git a/maps/ssanne2.blk b/maps/SSAnne2F.blk
index db2ae854..db2ae854 100644
--- a/maps/ssanne2.blk
+++ b/maps/SSAnne2F.blk
diff --git a/maps/ssanne10.blk b/maps/SSAnne2FRooms.blk
index b6666f9a..b6666f9a 100644
--- a/maps/ssanne10.blk
+++ b/maps/SSAnne2FRooms.blk
diff --git a/maps/ssanne3.blk b/maps/SSAnne3F.blk
index 6e4b42f4..6e4b42f4 100644
--- a/maps/ssanne3.blk
+++ b/maps/SSAnne3F.blk
diff --git a/maps/ssanne4.blk b/maps/SSAnneB1F.blk
index f22fb770..f22fb770 100644
--- a/maps/ssanne4.blk
+++ b/maps/SSAnneB1F.blk
diff --git a/maps/ssanne9.blk b/maps/SSAnneB1FRooms.blk
index b6666f9a..b6666f9a 100644
--- a/maps/ssanne9.blk
+++ b/maps/SSAnneB1FRooms.blk
diff --git a/maps/ssanne5.blk b/maps/SSAnneBow.blk
index e97bab53..e97bab53 100644
--- a/maps/ssanne5.blk
+++ b/maps/SSAnneBow.blk
diff --git a/maps/ssanne7.blk b/maps/SSAnneCaptainsRoom.blk
index b5359f38..b5359f38 100644
--- a/maps/ssanne7.blk
+++ b/maps/SSAnneCaptainsRoom.blk
diff --git a/maps/ssanne6.blk b/maps/SSAnneKitchen.blk
index 2a417ad2..2a417ad2 100644
--- a/maps/ssanne6.blk
+++ b/maps/SSAnneKitchen.blk
diff --git a/maps/safarizonecenter.blk b/maps/SafariZoneCenter.blk
index f4814712..f4814712 100644
--- a/maps/safarizonecenter.blk
+++ b/maps/SafariZoneCenter.blk
diff --git a/maps/safarizoneresthouse1.blk b/maps/SafariZoneCenterRestHouse.blk
index 625b41b6..625b41b6 100644
--- a/maps/safarizoneresthouse1.blk
+++ b/maps/SafariZoneCenterRestHouse.blk
diff --git a/maps/safarizoneeast.blk b/maps/SafariZoneEast.blk
index 564fa502..564fa502 100644
--- a/maps/safarizoneeast.blk
+++ b/maps/SafariZoneEast.blk
diff --git a/maps/safarizoneresthouse2.blk b/maps/SafariZoneEastRestHouse.blk
index 625b41b6..625b41b6 100644
--- a/maps/safarizoneresthouse2.blk
+++ b/maps/SafariZoneEastRestHouse.blk
diff --git a/maps/safarizoneentrance.blk b/maps/SafariZoneGate.blk
index f69dfa87..f69dfa87 100644
--- a/maps/safarizoneentrance.blk
+++ b/maps/SafariZoneGate.blk
diff --git a/maps/safarizonenorth.blk b/maps/SafariZoneNorth.blk
index a5f4251c..a5f4251c 100644
--- a/maps/safarizonenorth.blk
+++ b/maps/SafariZoneNorth.blk
diff --git a/maps/safarizoneresthouse3.blk b/maps/SafariZoneNorthRestHouse.blk
index 625b41b6..625b41b6 100644
--- a/maps/safarizoneresthouse3.blk
+++ b/maps/SafariZoneNorthRestHouse.blk
diff --git a/maps/safarizonesecrethouse.blk b/maps/SafariZoneSecretHouse.blk
index d5dbe9e1..d5dbe9e1 100644
--- a/maps/safarizonesecrethouse.blk
+++ b/maps/SafariZoneSecretHouse.blk
diff --git a/maps/safarizonewest.blk b/maps/SafariZoneWest.blk
index 88c8460c..88c8460c 100644
--- a/maps/safarizonewest.blk
+++ b/maps/SafariZoneWest.blk
diff --git a/maps/safarizoneresthouse4.blk b/maps/SafariZoneWestRestHouse.blk
index 625b41b6..625b41b6 100644
--- a/maps/safarizoneresthouse4.blk
+++ b/maps/SafariZoneWestRestHouse.blk
diff --git a/maps/saffroncity.blk b/maps/SaffronCity.blk
index e0c2b224..e0c2b224 100644
--- a/maps/saffroncity.blk
+++ b/maps/SaffronCity.blk
diff --git a/maps/saffrongym.blk b/maps/SaffronGym.blk
index 44a24aad..44a24aad 100644
--- a/maps/saffrongym.blk
+++ b/maps/SaffronGym.blk
diff --git a/maps/saffronmart.blk b/maps/SaffronMart.blk
index 1da8fffc..1da8fffc 100644
--- a/maps/saffronmart.blk
+++ b/maps/SaffronMart.blk
diff --git a/maps/saffronhouse2.blk b/maps/SaffronPidgeyHouse.blk
index 823e6053..823e6053 100644
--- a/maps/saffronhouse2.blk
+++ b/maps/SaffronPidgeyHouse.blk
diff --git a/maps/saffronpokecenter.blk b/maps/SaffronPokecenter.blk
index 9641efe4..9641efe4 100644
--- a/maps/saffronpokecenter.blk
+++ b/maps/SaffronPokecenter.blk
diff --git a/maps/seafoamislands1.blk b/maps/SeafoamIslands1F.blk
index 3cd6e5c7..3cd6e5c7 100644
--- a/maps/seafoamislands1.blk
+++ b/maps/SeafoamIslands1F.blk
diff --git a/maps/seafoamislands2.blk b/maps/SeafoamIslandsB1F.blk
index 61402221..61402221 100644
--- a/maps/seafoamislands2.blk
+++ b/maps/SeafoamIslandsB1F.blk
diff --git a/maps/seafoamislands3.blk b/maps/SeafoamIslandsB2F.blk
index cc037328..cc037328 100644
--- a/maps/seafoamislands3.blk
+++ b/maps/SeafoamIslandsB2F.blk
diff --git a/maps/seafoamislands4.blk b/maps/SeafoamIslandsB3F.blk
index 956a1053..956a1053 100644
--- a/maps/seafoamislands4.blk
+++ b/maps/SeafoamIslandsB3F.blk
diff --git a/maps/seafoamislands5.blk b/maps/SeafoamIslandsB4F.blk
index a118fe57..a118fe57 100644
--- a/maps/seafoamislands5.blk
+++ b/maps/SeafoamIslandsB4F.blk
diff --git a/maps/silphco10.blk b/maps/SilphCo10F.blk
index 88669221..88669221 100644
--- a/maps/silphco10.blk
+++ b/maps/SilphCo10F.blk
diff --git a/maps/silphco11.blk b/maps/SilphCo11F.blk
index 9bd21b04..9bd21b04 100644
--- a/maps/silphco11.blk
+++ b/maps/SilphCo11F.blk
diff --git a/maps/silphco1.blk b/maps/SilphCo1F.blk
index 3bf7c8f0..3bf7c8f0 100644
--- a/maps/silphco1.blk
+++ b/maps/SilphCo1F.blk
diff --git a/maps/silphco2.blk b/maps/SilphCo2F.blk
index 33003175..33003175 100644
--- a/maps/silphco2.blk
+++ b/maps/SilphCo2F.blk
diff --git a/maps/silphco3.blk b/maps/SilphCo3F.blk
index 15dcaf1f..15dcaf1f 100644
--- a/maps/silphco3.blk
+++ b/maps/SilphCo3F.blk
diff --git a/maps/silphco4.blk b/maps/SilphCo4F.blk
index 4e6c32f8..4e6c32f8 100644
--- a/maps/silphco4.blk
+++ b/maps/SilphCo4F.blk
diff --git a/maps/silphco5.blk b/maps/SilphCo5F.blk
index 1fa92a59..1fa92a59 100644
--- a/maps/silphco5.blk
+++ b/maps/SilphCo5F.blk
diff --git a/maps/silphco6.blk b/maps/SilphCo6F.blk
index 02d5b56e..02d5b56e 100644
--- a/maps/silphco6.blk
+++ b/maps/SilphCo6F.blk
diff --git a/maps/silphco7.blk b/maps/SilphCo7F.blk
index a8dd509a..a8dd509a 100644
--- a/maps/silphco7.blk
+++ b/maps/SilphCo7F.blk
diff --git a/maps/silphco8.blk b/maps/SilphCo8F.blk
index 5df4ebd8..5df4ebd8 100644
--- a/maps/silphco8.blk
+++ b/maps/SilphCo8F.blk
diff --git a/maps/silphco9.blk b/maps/SilphCo9F.blk
index 47d080dd..47d080dd 100644
--- a/maps/silphco9.blk
+++ b/maps/SilphCo9F.blk
diff --git a/maps/silphcoelevator.blk b/maps/SilphCoElevator.blk
index 824bc3de..824bc3de 100644
--- a/maps/silphcoelevator.blk
+++ b/maps/SilphCoElevator.blk
diff --git a/maps/tradecenter.blk b/maps/TradeCenter.blk
index 638b48ef..638b48ef 100644
--- a/maps/tradecenter.blk
+++ b/maps/TradeCenter.blk
diff --git a/maps/undergroundpathns.blk b/maps/UndergroundPathNorthSouth.blk
index 6431328e..6431328e 100644
--- a/maps/undergroundpathns.blk
+++ b/maps/UndergroundPathNorthSouth.blk
diff --git a/maps/undergroundpathentranceroute5.blk b/maps/UndergroundPathRoute5.blk
index a17a7ed2..a17a7ed2 100644
--- a/maps/undergroundpathentranceroute5.blk
+++ b/maps/UndergroundPathRoute5.blk
diff --git a/maps/undergroundpathentranceroute6.blk b/maps/UndergroundPathRoute6.blk
index a17a7ed2..a17a7ed2 100644
--- a/maps/undergroundpathentranceroute6.blk
+++ b/maps/UndergroundPathRoute6.blk
diff --git a/maps/undergroundpathentranceroute7.blk b/maps/UndergroundPathRoute7.blk
index a17a7ed2..a17a7ed2 100644
--- a/maps/undergroundpathentranceroute7.blk
+++ b/maps/UndergroundPathRoute7.blk
diff --git a/maps/undergroundpathentranceroute8.blk b/maps/UndergroundPathRoute8.blk
index a17a7ed2..a17a7ed2 100644
--- a/maps/undergroundpathentranceroute8.blk
+++ b/maps/UndergroundPathRoute8.blk
diff --git a/maps/undergroundpathwe.blk b/maps/UndergroundPathWestEast.blk
index 79ea699a..79ea699a 100644
--- a/maps/undergroundpathwe.blk
+++ b/maps/UndergroundPathWestEast.blk
diff --git a/maps/unusedblocks60258.blk b/maps/UnusedDiglettsCaveCopy.blk
index ff81fc7d..ff81fc7d 100755
--- a/maps/unusedblocks60258.blk
+++ b/maps/UnusedDiglettsCaveCopy.blk
diff --git a/maps/unusedblocks60cef.blk b/maps/UnusedEmptyMap.blk
index 21808bb7..21808bb7 100755
--- a/maps/unusedblocks60cef.blk
+++ b/maps/UnusedEmptyMap.blk
diff --git a/maps/unusedblocks58d7d.blk b/maps/UnusedPokecenterCopy.blk
index 9641efe4..9641efe4 100755
--- a/maps/unusedblocks58d7d.blk
+++ b/maps/UnusedPokecenterCopy.blk
diff --git a/maps/vermilioncity.blk b/maps/VermilionCity.blk
index 6ba54a34..6ba54a34 100644
--- a/maps/vermilioncity.blk
+++ b/maps/VermilionCity.blk
diff --git a/maps/vermiliondock.blk b/maps/VermilionDock.blk
index f4a95739..f4a95739 100644
--- a/maps/vermiliondock.blk
+++ b/maps/VermilionDock.blk
diff --git a/maps/vermiliongym.blk b/maps/VermilionGym.blk
index 27bea181..27bea181 100644
--- a/maps/vermiliongym.blk
+++ b/maps/VermilionGym.blk
diff --git a/maps/vermilionmart.blk b/maps/VermilionMart.blk
index 1da8fffc..1da8fffc 100644
--- a/maps/vermilionmart.blk
+++ b/maps/VermilionMart.blk
diff --git a/maps/vermilionhouse1.blk b/maps/VermilionOldRodHouse.blk
index 823e6053..823e6053 100644
--- a/maps/vermilionhouse1.blk
+++ b/maps/VermilionOldRodHouse.blk
diff --git a/maps/vermilionhouse2.blk b/maps/VermilionPidgeyHouse.blk
index 823e6053..823e6053 100644
--- a/maps/vermilionhouse2.blk
+++ b/maps/VermilionPidgeyHouse.blk
diff --git a/maps/vermilionpokecenter.blk b/maps/VermilionPokecenter.blk
index 9641efe4..9641efe4 100644
--- a/maps/vermilionpokecenter.blk
+++ b/maps/VermilionPokecenter.blk
diff --git a/maps/vermilionhouse3.blk b/maps/VermilionTradeHouse.blk
index 823e6053..823e6053 100644
--- a/maps/vermilionhouse3.blk
+++ b/maps/VermilionTradeHouse.blk
diff --git a/maps/victoryroad1.blk b/maps/VictoryRoad1F.blk
index 4afaf65d..4afaf65d 100644
--- a/maps/victoryroad1.blk
+++ b/maps/VictoryRoad1F.blk
diff --git a/maps/victoryroad2.blk b/maps/VictoryRoad2F.blk
index f4226ccf..f4226ccf 100644
--- a/maps/victoryroad2.blk
+++ b/maps/VictoryRoad2F.blk
diff --git a/maps/victoryroad3.blk b/maps/VictoryRoad3F.blk
index 53aa23eb..53aa23eb 100644
--- a/maps/victoryroad3.blk
+++ b/maps/VictoryRoad3F.blk
diff --git a/maps/viridiancity.blk b/maps/ViridianCity.blk
index af1bd662..af1bd662 100644
--- a/maps/viridiancity.blk
+++ b/maps/ViridianCity.blk
diff --git a/maps/viridianforest.blk b/maps/ViridianForest.blk
index 358ea01d..358ea01d 100644
--- a/maps/viridianforest.blk
+++ b/maps/ViridianForest.blk
diff --git a/maps/viridianforestentrance.blk b/maps/ViridianForestNorthGate.blk
index 19af9540..19af9540 100644
--- a/maps/viridianforestentrance.blk
+++ b/maps/ViridianForestNorthGate.blk
diff --git a/maps/viridianforestexit.blk b/maps/ViridianForestSouthGate.blk
index 19af9540..19af9540 100644
--- a/maps/viridianforestexit.blk
+++ b/maps/ViridianForestSouthGate.blk
diff --git a/maps/viridiangym.blk b/maps/ViridianGym.blk
index 4396d338..4396d338 100644
--- a/maps/viridiangym.blk
+++ b/maps/ViridianGym.blk
diff --git a/maps/viridianmart.blk b/maps/ViridianMart.blk
index 1da8fffc..1da8fffc 100644
--- a/maps/viridianmart.blk
+++ b/maps/ViridianMart.blk
diff --git a/maps/viridianhouse.blk b/maps/ViridianNicknameHouse.blk
index 823e6053..823e6053 100644
--- a/maps/viridianhouse.blk
+++ b/maps/ViridianNicknameHouse.blk
diff --git a/maps/viridianpokecenter.blk b/maps/ViridianPokecenter.blk
index 9641efe4..9641efe4 100644
--- a/maps/viridianpokecenter.blk
+++ b/maps/ViridianPokecenter.blk
diff --git a/maps/school.blk b/maps/ViridianSchoolHouse.blk
index 51bf8401..51bf8401 100644
--- a/maps/school.blk
+++ b/maps/ViridianSchoolHouse.blk
diff --git a/maps/fuchsiahouse2.blk b/maps/WardensHouse.blk
index 1ad21f96..1ad21f96 100644
--- a/maps/fuchsiahouse2.blk
+++ b/maps/WardensHouse.blk
diff --git a/maps/route19-yellow.blk b/maps/route19-yellow.blk
deleted file mode 100644
index 3fc58494..00000000
--- a/maps/route19-yellow.blk
+++ /dev/null
@@ -1 +0,0 @@
-(,)(,)(,)$W%$W%CCC11111CCC111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk
\ No newline at end of file
diff --git a/scripts/agatha.asm b/scripts/AgathasRoom.asm
index 88d6a8de..a1dba196 100755
--- a/scripts/agatha.asm
+++ b/scripts/AgathasRoom.asm
@@ -1,11 +1,11 @@
-AgathaScript:
+AgathasRoom_Script:
 	call AgathaShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
 	ld hl, AgathaTrainerHeader0
-	ld de, AgathaScriptPointers
-	ld a, [wAgathaCurScript]
+	ld de, AgathasRoom_ScriptPointers
+	ld a, [wAgathasRoomCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wAgathaCurScript], a
+	ld [wAgathasRoomCurScript], a
 	ret
 
 AgathaShowOrHideExitBlock:
@@ -27,10 +27,10 @@ AgathaShowOrHideExitBlock:
 
 ResetAgathaScript:
 	xor a
-	ld [wAgathaCurScript], a
+	ld [wAgathasRoomCurScript], a
 	ret
 
-AgathaScriptPointers:
+AgathasRoom_ScriptPointers:
 	dw AgathaScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw AgathaScript2
@@ -54,7 +54,7 @@ AgathaScriptWalkIntoRoom:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wAgathaCurScript], a
+	ld [wAgathasRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -82,7 +82,7 @@ AgathaScript0:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wAgathaCurScript], a
+	ld [wAgathasRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -100,7 +100,7 @@ AgathaScript3:
 	call Delay3
 	xor a
 	ld [wJoyIgnore], a
-	ld [wAgathaCurScript], a
+	ld [wAgathasRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -113,10 +113,10 @@ AgathaScript2:
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $1
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
-AgathaTextPointers:
+AgathasRoom_TextPointers:
 	dw AgathaText1
 	dw AgathaDontRunAwayText
 
diff --git a/scripts/bikeshop.asm b/scripts/BikeShop.asm
index 4d6853be..71149759 100755
--- a/scripts/bikeshop.asm
+++ b/scripts/BikeShop.asm
@@ -1,7 +1,7 @@
-BikeShopScript:
+BikeShop_Script:
 	jp EnableAutoTextBoxDrawing
 
-BikeShopTextPointers:
+BikeShop_TextPointers:
 	dw BikeShopText1
 	dw BikeShopText2
 	dw BikeShopText3
diff --git a/scripts/billshouse.asm b/scripts/BillsHouse.asm
index 2b60ef8c..74efc960 100755
--- a/scripts/billshouse.asm
+++ b/scripts/BillsHouse.asm
@@ -1,10 +1,10 @@
-BillsHouseScript:
+BillsHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ld a, [wBillsHouseCurScript]
-	ld hl, BillsHouseScriptPointers
+	ld hl, BillsHouse_ScriptPointers
 	jp CallFunctionInTable
 
-BillsHouseScriptPointers:
+BillsHouse_ScriptPointers:
 	dw BillsHouseScript0
 	dw BillsHouseScript1
 	dw BillsHouseScript2
@@ -115,7 +115,7 @@ BillsHouseScript5:
 	ld [wBillsHouseCurScript], a
 	ret
 
-BillsHouseTextPointers:
+BillsHouse_TextPointers:
 	dw BillsHouseText1
 	dw BillsHouseText2
 	dw BillsHouseText3
diff --git a/scripts/blueshouse.asm b/scripts/BluesHouse.asm
index 2b72ef97..f325049f 100755
--- a/scripts/blueshouse.asm
+++ b/scripts/BluesHouse.asm
@@ -1,10 +1,10 @@
-BluesHouseScript:
+BluesHouse_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, BluesHouseScriptPointers
+	ld hl, BluesHouse_ScriptPointers
 	ld a, [wBluesHouseCurScript]
 	jp CallFunctionInTable
 
-BluesHouseScriptPointers:
+BluesHouse_ScriptPointers:
 	dw BluesHouseScript0
 	dw BluesHouseScript1
 
@@ -19,7 +19,7 @@ BluesHouseScript0:
 BluesHouseScript1:
 	ret
 
-BluesHouseTextPointers:
+BluesHouse_TextPointers:
 	dw BluesHouseText1
 	dw BluesHouseText2
 	dw BluesHouseText3
diff --git a/scripts/bruno.asm b/scripts/BrunosRoom.asm
index 02ceebf2..3b6385b7 100755
--- a/scripts/bruno.asm
+++ b/scripts/BrunosRoom.asm
@@ -1,11 +1,11 @@
-BrunoScript:
+BrunosRoom_Script:
 	call BrunoShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
 	ld hl, BrunoTrainerHeader0
-	ld de, BrunoScriptPointers
-	ld a, [wBrunoCurScript]
+	ld de, BrunosRoom_ScriptPointers
+	ld a, [wBrunosRoomCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wBrunoCurScript], a
+	ld [wBrunosRoomCurScript], a
 	ret
 
 BrunoShowOrHideExitBlock:
@@ -27,10 +27,10 @@ BrunoShowOrHideExitBlock:
 
 ResetBrunoScript:
 	xor a
-	ld [wBrunoCurScript], a
+	ld [wBrunosRoomCurScript], a
 	ret
 
-BrunoScriptPointers:
+BrunosRoom_ScriptPointers:
 	dw BrunoScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw BrunoScript2
@@ -54,7 +54,7 @@ BrunoScriptWalkIntoRoom:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wBrunoCurScript], a
+	ld [wBrunosRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -82,7 +82,7 @@ BrunoScript0:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wBrunoCurScript], a
+	ld [wBrunosRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -100,7 +100,7 @@ BrunoScript3:
 	call Delay3
 	xor a
 	ld [wJoyIgnore], a
-	ld [wBrunoCurScript], a
+	ld [wBrunosRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -113,7 +113,7 @@ BrunoScript2:
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-BrunoTextPointers:
+BrunosRoom_TextPointers:
 	dw BrunoText1
 	dw BrunoDontRunAwayText
 
diff --git a/scripts/celadonhouse.asm b/scripts/CeladonChiefHouse.asm
index 7f2778d1..fc37bd4d 100755
--- a/scripts/celadonhouse.asm
+++ b/scripts/CeladonChiefHouse.asm
@@ -1,8 +1,8 @@
-CeladonHouseScript:
+CeladonChiefHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonHouseTextPointers:
+CeladonChiefHouse_TextPointers:
 	dw CeladonHouseText1
 	dw CeladonHouseText2
 	dw CeladonHouseText3
diff --git a/scripts/celadoncity.asm b/scripts/CeladonCity.asm
index 6ef679dc..e2d7d371 100755
--- a/scripts/celadoncity.asm
+++ b/scripts/CeladonCity.asm
@@ -1,10 +1,10 @@
-CeladonCityScript:
+CeladonCity_Script:
 	call EnableAutoTextBoxDrawing
 	ResetEvents EVENT_1B8, EVENT_1BF
 	ResetEvent EVENT_67F
 	ret
 
-CeladonCityTextPointers:
+CeladonCity_TextPointers:
 	dw CeladonCityText1
 	dw CeladonCityText2
 	dw CeladonCityText3
diff --git a/scripts/celadondiner.asm b/scripts/CeladonDiner.asm
index 6fd594f7..371205de 100755
--- a/scripts/celadondiner.asm
+++ b/scripts/CeladonDiner.asm
@@ -1,8 +1,8 @@
-CeladonDinerScript:
+CeladonDiner_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonDinerTextPointers:
+CeladonDiner_TextPointers:
 	dw CeladonDinerText1
 	dw CeladonDinerText2
 	dw CeladonDinerText3
diff --git a/scripts/celadongym.asm b/scripts/CeladonGym.asm
index ae7e6846..8ceb36ee 100755
--- a/scripts/celadongym.asm
+++ b/scripts/CeladonGym.asm
@@ -1,11 +1,11 @@
-CeladonGymScript:
+CeladonGym_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, CeladonGymScript_48927
 	call EnableAutoTextBoxDrawing
 	ld hl, CeladonGymTrainerHeader0
-	ld de, CeladonGymScriptPointers
+	ld de, CeladonGym_ScriptPointers
 	ld a, [wCeladonGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wCeladonGymCurScript], a
@@ -29,7 +29,7 @@ CeladonGymText_48943:
 	ld [wCurMapScript], a
 	ret
 
-CeladonGymScriptPointers:
+CeladonGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -70,7 +70,7 @@ CeladonGymText_48963:
 
 	jp CeladonGymText_48943
 
-CeladonGymTextPointers:
+CeladonGym_TextPointers:
 	dw CeladonGymText1
 	dw CeladonGymText2
 	dw CeladonGymText3
diff --git a/scripts/celadonhotel.asm b/scripts/CeladonHotel.asm
index 23b9eb55..ee4e140c 100755
--- a/scripts/celadonhotel.asm
+++ b/scripts/CeladonHotel.asm
@@ -1,7 +1,7 @@
-CeladonHotelScript:
+CeladonHotel_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonHotelTextPointers:
+CeladonHotel_TextPointers:
 	dw CeladonHotelText1
 	dw CeladonHotelText2
 	dw CeladonHotelText3
diff --git a/scripts/celadonmansion1.asm b/scripts/CeladonMansion1F.asm
index f6ef7669..41524983 100755
--- a/scripts/celadonmansion1.asm
+++ b/scripts/CeladonMansion1F.asm
@@ -1,7 +1,7 @@
-CeladonMansion1Script:
+CeladonMansion1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMansion1TextPointers:
+CeladonMansion1F_TextPointers:
 	dw CeladonMansion1Text1
 	dw CeladonMansion1Text2
 	dw CeladonMansion1Text3
diff --git a/scripts/celadonmansion2.asm b/scripts/CeladonMansion2F.asm
index 520615d4..9deb606d 100755
--- a/scripts/celadonmansion2.asm
+++ b/scripts/CeladonMansion2F.asm
@@ -1,8 +1,8 @@
-CeladonMansion2Script:
+CeladonMansion2F_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeladonMansion2TextPointers:
+CeladonMansion2F_TextPointers:
 	dw CeladonMansion2Text1
 
 CeladonMansion2Text1:
diff --git a/scripts/celadonmansion3.asm b/scripts/CeladonMansion3F.asm
index a1fe048b..43832f63 100755
--- a/scripts/celadonmansion3.asm
+++ b/scripts/CeladonMansion3F.asm
@@ -1,7 +1,7 @@
-CeladonMansion3Script:
+CeladonMansion3F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMansion3TextPointers:
+CeladonMansion3F_TextPointers:
 	dw ProgrammerText
 	dw GraphicArtistText
 	dw WriterText
diff --git a/scripts/celadonmansion4.asm b/scripts/CeladonMansionRoof.asm
index 80d887e9..d5028537 100755
--- a/scripts/celadonmansion4.asm
+++ b/scripts/CeladonMansionRoof.asm
@@ -1,7 +1,7 @@
-CeladonMansion4Script:
+CeladonMansionRoof_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMansion4TextPointers:
+CeladonMansionRoof_TextPointers:
 	dw CeladonMansion4Text1
 
 CeladonMansion4Text1:
diff --git a/scripts/celadonmansion5.asm b/scripts/CeladonMansionRoofHouse.asm
index 197a0f54..e519d506 100755
--- a/scripts/celadonmansion5.asm
+++ b/scripts/CeladonMansionRoofHouse.asm
@@ -1,7 +1,7 @@
-CeladonMansion5Script:
+CeladonMansionRoofHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMansion5TextPointers:
+CeladonMansionRoofHouse_TextPointers:
 	dw CeladonMansion5Text1
 	dw CeladonMansion5Text2
 
@@ -14,7 +14,7 @@ CeladonMansion5Text2:
 	lb bc, EEVEE, 25
 	call GivePokemon
 	jr nc, .asm_24365
-	ld a, HS_CELADON_MANSION_5_GIFT
+	ld a, HS_CELADON_MANSION_EEVEE_GIFT
 	ld [wMissableObjectIndex], a
 	predef HideObject
 .asm_24365
diff --git a/scripts/celadonmart1.asm b/scripts/CeladonMart1F.asm
index 0f67972b..8afd805a 100755
--- a/scripts/celadonmart1.asm
+++ b/scripts/CeladonMart1F.asm
@@ -1,7 +1,7 @@
-CeladonMart1Script:
+CeladonMart1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMart1TextPointers:
+CeladonMart1F_TextPointers:
 	dw CeladonMart1Text1
 	dw CeladonMart1Text2
 	dw CeladonMart1Text3
diff --git a/scripts/celadonmart2.asm b/scripts/CeladonMart2F.asm
index c438d6e1..787c186e 100755
--- a/scripts/celadonmart2.asm
+++ b/scripts/CeladonMart2F.asm
@@ -1,7 +1,7 @@
-CeladonMart2Script:
+CeladonMart2F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMart2TextPointers:
+CeladonMart2F_TextPointers:
 	dw CeladonMart2Clerk1Text
 	dw CeladonMart2Clerk2Text
 	dw CeladonMart2Text3
diff --git a/scripts/celadonmart3.asm b/scripts/CeladonMart3F.asm
index 6af58f21..e7e216d9 100755
--- a/scripts/celadonmart3.asm
+++ b/scripts/CeladonMart3F.asm
@@ -1,7 +1,7 @@
-CeladonMart3Script:
+CeladonMart3F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMart3TextPointers:
+CeladonMart3F_TextPointers:
 	dw CeladonMart3Text1
 	dw CeladonMart3Text2
 	dw CeladonMart3Text3
diff --git a/scripts/celadonmart4.asm b/scripts/CeladonMart4F.asm
index 18049dc0..20f817e9 100755
--- a/scripts/celadonmart4.asm
+++ b/scripts/CeladonMart4F.asm
@@ -1,7 +1,7 @@
-CeladonMart4Script:
+CeladonMart4F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMart4TextPointers:
+CeladonMart4F_TextPointers:
 	dw CeladonMart4ClerkText
 	dw CeladonMart4Text2
 	dw CeladonMart4Text3
diff --git a/scripts/celadonmart5.asm b/scripts/CeladonMart5F.asm
index 7b7371a7..9f52f866 100755
--- a/scripts/celadonmart5.asm
+++ b/scripts/CeladonMart5F.asm
@@ -1,7 +1,7 @@
-CeladonMart5Script:
+CeladonMart5F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonMart5TextPointers:
+CeladonMart5F_TextPointers:
 	dw CeladonMart5Text1
 	dw CeladonMart5Text2
 	dw CeladonMart5Clerk1Text
diff --git a/scripts/celadonmartelevator.asm b/scripts/CeladonMartElevator.asm
index 60e5210c..34b923f9 100755
--- a/scripts/celadonmartelevator.asm
+++ b/scripts/CeladonMartElevator.asm
@@ -1,4 +1,4 @@
-CeladonMartElevatorScript:
+CeladonMartElevator_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -52,17 +52,17 @@ CeladonMartElevatorWarpMaps:
 ; first byte is warp number
 ; second byte is map number
 ; These specify where the player goes after getting out of the elevator.
-	db $05, CELADON_MART_1
-	db $02, CELADON_MART_2
-	db $02, CELADON_MART_3
-	db $02, CELADON_MART_4
-	db $02, CELADON_MART_5
+	db $05, CELADON_MART_1F
+	db $02, CELADON_MART_2F
+	db $02, CELADON_MART_3F
+	db $02, CELADON_MART_4F
+	db $02, CELADON_MART_5F
 CeladonMartElevatorWarpMapsEnd:
 
 CeladonMartElevatorScript_48654:
 	jpba ShakeElevator
 
-CeladonMartElevatorTextPointers:
+CeladonMartElevator_TextPointers:
 	dw CeladonMartElevatorText1
 
 CeladonMartElevatorText1:
diff --git a/scripts/celadonmartroof.asm b/scripts/CeladonMartRoof.asm
index 9034e8fc..35c740b2 100755
--- a/scripts/celadonmartroof.asm
+++ b/scripts/CeladonMartRoof.asm
@@ -1,4 +1,4 @@
-CeladonMartRoofScript:
+CeladonMartRoof_Script:
 	jp EnableAutoTextBoxDrawing
 
 CeladonMartRoofScript_GetDrinksInBag:
@@ -205,7 +205,7 @@ CeladonMartRoofScript_PrintDrinksInBag:
 	pop hl
 	jr .loop
 
-CeladonMartRoofTextPointers:
+CeladonMartRoof_TextPointers:
 	dw CeladonMartRoofText1
 	dw CeladonMartRoofText2
 	dw CeladonMartRoofText5
diff --git a/scripts/celadonpokecenter.asm b/scripts/CeladonPokecenter.asm
index bd91af20..b5efb7d5 100755
--- a/scripts/celadonpokecenter.asm
+++ b/scripts/CeladonPokecenter.asm
@@ -1,8 +1,8 @@
-CeladonPokecenterScript:
+CeladonPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-CeladonPokecenterTextPointers:
+CeladonPokecenter_TextPointers:
 	dw CeladonHealNurseText
 	dw CeladonPokecenterText2
 	dw CeladonPokecenterText3
diff --git a/scripts/ceruleanhouse2.asm b/scripts/CeruleanBadgeHouse.asm
index e83c2194..cab2bf23 100755
--- a/scripts/ceruleanhouse2.asm
+++ b/scripts/CeruleanBadgeHouse.asm
@@ -1,11 +1,11 @@
-CeruleanHouse2Script:
+CeruleanBadgeHouse_Script:
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	dec a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ret
 
-CeruleanHouse2TextPointers:
+CeruleanBadgeHouse_TextPointers:
 	dw CeruleanHouse2Text1
 
 CeruleanHouse2Text1:
diff --git a/scripts/unknowndungeon1.asm b/scripts/CeruleanCave1F.asm
index 9d7f120e..6f5c7b13 100755
--- a/scripts/unknowndungeon1.asm
+++ b/scripts/CeruleanCave1F.asm
@@ -1,7 +1,7 @@
-UnknownDungeon1Script:
+CeruleanCave1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-UnknownDungeon1TextPointers:
+CeruleanCave1F_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
diff --git a/scripts/unknowndungeon2.asm b/scripts/CeruleanCave2F.asm
index 3ed00a45..1bc8457b 100755
--- a/scripts/unknowndungeon2.asm
+++ b/scripts/CeruleanCave2F.asm
@@ -1,7 +1,7 @@
-UnknownDungeon2Script:
+CeruleanCave2F_Script:
 	jp EnableAutoTextBoxDrawing
 
-UnknownDungeon2TextPointers:
+CeruleanCave2F_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
diff --git a/scripts/unknowndungeon3.asm b/scripts/CeruleanCaveB1F.asm
index 78b1ab80..a570ab18 100755
--- a/scripts/unknowndungeon3.asm
+++ b/scripts/CeruleanCaveB1F.asm
@@ -1,18 +1,18 @@
-UnknownDungeon3Script:
+CeruleanCaveB1F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, MewtwoTrainerHeader
-	ld de, .ScriptPointers
-	ld a, [wUnknownDungeon3CurScript]
+	ld de, CeruleanCaveB1F_ScriptPointers
+	ld a, [wCeruleanCaveB1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wUnknownDungeon3CurScript], a
+	ld [wCeruleanCaveB1FCurScript], a
 	ret
 
-.ScriptPointers
+CeruleanCaveB1F_ScriptPointers
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-UnknownDungeon3TextPointers:
+CeruleanCaveB1F_TextPointers:
 	dw MewtwoText
 	dw PickUpItemText
 	dw PickUpItemText
diff --git a/scripts/ceruleancity.asm b/scripts/CeruleanCity.asm
index 555e75f1..117ec4da 100755
--- a/scripts/ceruleancity.asm
+++ b/scripts/CeruleanCity.asm
@@ -1,6 +1,6 @@
-CeruleanCityScript:
+CeruleanCity_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, CeruleanCityScriptPointers
+	ld hl, CeruleanCity_ScriptPointers
 	ld a, [wCeruleanCityCurScript]
 	jp CallFunctionInTable
 
@@ -12,7 +12,7 @@ CeruleanCityScript_1948c:
 	ld [wMissableObjectIndex], a
 	predef_jump HideObject
 
-CeruleanCityScriptPointers:
+CeruleanCity_ScriptPointers:
 	dw CeruleanCityScript0
 	dw CeruleanCityScript1
 	dw CeruleanCityScript2
@@ -227,7 +227,7 @@ CeruleanCityScript3:
 	ld [wCeruleanCityCurScript], a
 	ret
 
-CeruleanCityTextPointers:
+CeruleanCity_TextPointers:
 	dw CeruleanCityText1
 	dw CeruleanCityText2
 	dw CeruleanCityText3
diff --git a/scripts/ceruleancity2.asm b/scripts/CeruleanCity_2.asm
index 53ace5c8..53ace5c8 100755
--- a/scripts/ceruleancity2.asm
+++ b/scripts/CeruleanCity_2.asm
diff --git a/scripts/ceruleangym.asm b/scripts/CeruleanGym.asm
index b82b89f6..7d152b4f 100755
--- a/scripts/ceruleangym.asm
+++ b/scripts/CeruleanGym.asm
@@ -1,11 +1,11 @@
-CeruleanGymScript:
+CeruleanGym_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, CeruleanGymScript_5c6d0
 	call EnableAutoTextBoxDrawing
 	ld hl, CeruleanGymTrainerHeader0
-	ld de, CeruleanGymScriptPointers
+	ld de, CeruleanGym_ScriptPointers
 	ld a, [wCeruleanGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wCeruleanGymCurScript], a
@@ -29,7 +29,7 @@ CeruleanGymScript_5c6ed:
 	ld [wCurMapScript], a
 	ret
 
-CeruleanGymScriptPointers:
+CeruleanGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -70,7 +70,7 @@ CeruleanGymScript_5c70d:
 
 	jp CeruleanGymScript_5c6ed
 
-CeruleanGymTextPointers:
+CeruleanGym_TextPointers:
 	dw CeruleanGymText1
 	dw CeruleanGymText2
 	dw CeruleanGymText3
diff --git a/scripts/ceruleanmart.asm b/scripts/CeruleanMart.asm
index 76d83f90..f812aadd 100755
--- a/scripts/ceruleanmart.asm
+++ b/scripts/CeruleanMart.asm
@@ -1,7 +1,7 @@
-CeruleanMartScript:
+CeruleanMart_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeruleanMartTextPointers:
+CeruleanMart_TextPointers:
 	dw CeruleanCashierText
 	dw CeruleanMartText2
 	dw CeruleanMartText3
diff --git a/scripts/ceruleanpokecenter.asm b/scripts/CeruleanPokecenter.asm
index b758f497..82bd04f3 100755
--- a/scripts/ceruleanpokecenter.asm
+++ b/scripts/CeruleanPokecenter.asm
@@ -1,8 +1,8 @@
-CeruleanPokecenterScript:
+CeruleanPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-CeruleanPokecenterTextPointers:
+CeruleanPokecenter_TextPointers:
 	dw CeruleanHealNurseText
 	dw CeruleanPokecenterText2
 	dw CeruleanPokecenterText3
diff --git a/scripts/ceruleanhouse1.asm b/scripts/CeruleanTradeHouse.asm
index 181a22c3..f80da19a 100755
--- a/scripts/ceruleanhouse1.asm
+++ b/scripts/CeruleanTradeHouse.asm
@@ -1,7 +1,7 @@
-CeruleanHouse1Script:
+CeruleanTradeHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeruleanHouse1TextPointers:
+CeruleanTradeHouse_TextPointers:
 	dw CeruleanHouse1Text1
 	dw CeruleanHouse1Text2
 
diff --git a/scripts/ceruleanhousetrashed.asm b/scripts/CeruleanTrashedHouse.asm
index da848b7c..f249ef01 100755
--- a/scripts/ceruleanhousetrashed.asm
+++ b/scripts/CeruleanTrashedHouse.asm
@@ -1,8 +1,8 @@
-CeruleanHouseTrashedScript:
+CeruleanTrashedHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-CeruleanHouseTrashedTextPointers:
+CeruleanTrashedHouse_TextPointers:
 	dw CeruleanHouseTrashedText1
 	dw CeruleanHouseTrashedText2
 	dw CeruleanHouseTrashedText3
diff --git a/scripts/gary.asm b/scripts/ChampionsRoom.asm
index 1fe65fb0..e3cdc6d2 100755
--- a/scripts/gary.asm
+++ b/scripts/ChampionsRoom.asm
@@ -1,16 +1,16 @@
-GaryScript:
+ChampionsRoom_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, GaryScriptPointers
-	ld a, [wGaryCurScript]
+	ld hl, ChampionsRoom_ScriptPointers
+	ld a, [wChampionsRoomCurScript]
 	jp CallFunctionInTable
 
 ResetGaryScript:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
-GaryScriptPointers:
+ChampionsRoom_ScriptPointers:
 	dw GaryScript0
 	dw GaryScript1
 	dw GaryScript2
@@ -36,7 +36,7 @@ GaryScript1:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $2
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryEntrance_RLEMovement:
@@ -86,7 +86,7 @@ GaryScript2:
 	xor a
 	ld [hJoyHeld], a
 	ld a, $3
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryScript3:
@@ -104,7 +104,7 @@ GaryScript3:
 	ld [H_SPRITEINDEX], a
 	call SetSpriteMovementBytesToFF
 	ld a, $4
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryScript4:
@@ -123,7 +123,7 @@ GaryScript4:
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	ld a, $5
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 OakEntranceAfterVictoryMovement:
@@ -154,7 +154,7 @@ GaryScript5:
 	ld [hSpriteIndexOrTextID], a
 	call GaryScript_760c8
 	ld a, $6
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryScript6:
@@ -167,7 +167,7 @@ GaryScript6:
 	ld [hSpriteIndexOrTextID], a
 	call GaryScript_760c8
 	ld a, $7
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryScript7:
@@ -184,7 +184,7 @@ GaryScript7:
 	ld [H_SPRITEINDEX], a
 	call MoveSprite
 	ld a, $8
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 OakExitGaryRoomMovement:
@@ -200,7 +200,7 @@ GaryScript8:
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	ld a, $9
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryScript9:
@@ -213,7 +213,7 @@ GaryScript9:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $a
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 WalkToHallOfFame_RLEMovment:
@@ -228,7 +228,7 @@ GaryScript10:
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
-	ld [wGaryCurScript], a
+	ld [wChampionsRoomCurScript], a
 	ret
 
 GaryScript_760c8:
@@ -239,7 +239,7 @@ GaryScript_760c8:
 	ld [wJoyIgnore], a
 	ret
 
-GaryTextPointers:
+ChampionsRoom_TextPointers:
 	dw GaryText1
 	dw GaryText2
 	dw GaryText3
diff --git a/scripts/cinnabargym.asm b/scripts/CinnabarGym.asm
index 8af7bbd3..295bd63d 100755
--- a/scripts/cinnabargym.asm
+++ b/scripts/CinnabarGym.asm
@@ -1,7 +1,7 @@
-CinnabarGymScript:
+CinnabarGym_Script:
 	call CinnabarGymScript_75759
 	call EnableAutoTextBoxDrawing
-	ld hl, CinnabarGymScriptPointers
+	ld hl, CinnabarGym_ScriptPointers
 	ld a, [wCinnabarGymCurScript]
 	jp CallFunctionInTable
 
@@ -40,7 +40,7 @@ CinnabarGymScript_757a0:
 	ld [wTrainerHeaderFlagBit], a
 	ret
 
-CinnabarGymScriptPointers:
+CinnabarGym_ScriptPointers:
 	dw CinnabarGymScript0
 	dw CinnabarGymScript1
 	dw CinnabarGymScript2
@@ -170,7 +170,7 @@ CinnabarGymScript3_75857:
 
 	jp CinnabarGymScript_75792
 
-CinnabarGymTextPointers:
+CinnabarGym_TextPointers:
 	dw CinnabarGymText1
 	dw CinnabarGymText2
 	dw CinnabarGymText3
diff --git a/scripts/cinnabarisland.asm b/scripts/CinnabarIsland.asm
index 8549042f..b6346a9c 100755
--- a/scripts/cinnabarisland.asm
+++ b/scripts/CinnabarIsland.asm
@@ -1,14 +1,14 @@
-CinnabarIslandScript:
+CinnabarIsland_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	ResetEvent EVENT_MANSION_SWITCH_ON
 	ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL
-	ld hl, CinnabarIslandScriptPointers
+	ld hl, CinnabarIsland_ScriptPointers
 	ld a, [wCinnabarIslandCurScript]
 	jp CallFunctionInTable
 
-CinnabarIslandScriptPointers:
+CinnabarIsland_ScriptPointers:
 	dw CinnabarIslandScript0
 	dw CinnabarIslandScript1
 
@@ -50,7 +50,7 @@ CinnabarIslandScript1:
 	ld [wCinnabarIslandCurScript], a
 	ret
 
-CinnabarIslandTextPointers:
+CinnabarIsland_TextPointers:
 	dw CinnabarIslandText1
 	dw CinnabarIslandText2
 	dw CinnabarIslandText3
diff --git a/scripts/lab1.asm b/scripts/CinnabarLab.asm
index 5b08f4f2..aab3324b 100755
--- a/scripts/lab1.asm
+++ b/scripts/CinnabarLab.asm
@@ -1,8 +1,8 @@
-Lab1Script:
+CinnabarLab_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-Lab1TextPointers:
+CinnabarLab_TextPointers:
 	dw Lab1Text1
 	dw Lab1Text2
 	dw Lab1Text3
diff --git a/scripts/lab4.asm b/scripts/CinnabarLabFossilRoom.asm
index 7d0db339..f5f03a19 100755
--- a/scripts/lab4.asm
+++ b/scripts/CinnabarLabFossilRoom.asm
@@ -1,7 +1,7 @@
-Lab4Script:
+CinnabarLabFossilRoom_Script:
 	jp EnableAutoTextBoxDrawing
 
-Lab4TextPointers:
+CinnabarLabFossilRoom_TextPointers:
 	dw Lab4Text1
 	dw Lab4Text2
 
diff --git a/scripts/lab3.asm b/scripts/CinnabarLabMetronomeRoom.asm
index b533d162..6eddceae 100755
--- a/scripts/lab3.asm
+++ b/scripts/CinnabarLabMetronomeRoom.asm
@@ -1,7 +1,7 @@
-Lab3Script:
+CinnabarLabMetronomeRoom_Script:
 	jp EnableAutoTextBoxDrawing
 
-Lab3TextPointers:
+CinnabarLabMetronomeRoom_TextPointers:
 	dw Lab3Text1
 	dw Lab3Text2
 	dw Lab3Text3
diff --git a/scripts/lab2.asm b/scripts/CinnabarLabTradeRoom.asm
index ed9ef1b4..6093ae14 100755
--- a/scripts/lab2.asm
+++ b/scripts/CinnabarLabTradeRoom.asm
@@ -1,7 +1,7 @@
-Lab2Script:
+CinnabarLabTradeRoom_Script:
 	jp EnableAutoTextBoxDrawing
 
-Lab2TextPointers:
+CinnabarLabTradeRoom_TextPointers:
 	dw Lab2Text1
 	dw Lab2Text2
 	dw Lab2Text3
diff --git a/scripts/cinnabarmart.asm b/scripts/CinnabarMart.asm
index 55b82cf0..898948c7 100755
--- a/scripts/cinnabarmart.asm
+++ b/scripts/CinnabarMart.asm
@@ -1,7 +1,7 @@
-CinnabarMartScript:
+CinnabarMart_Script:
 	jp EnableAutoTextBoxDrawing
 
-CinnabarMartTextPointers:
+CinnabarMart_TextPointers:
 	dw CinnabarCashierText
 	dw CinnabarMartText2
 	dw CinnabarMartText3
diff --git a/scripts/cinnabarpokecenter.asm b/scripts/CinnabarPokecenter.asm
index 2f6d5791..a6184bb0 100755
--- a/scripts/cinnabarpokecenter.asm
+++ b/scripts/CinnabarPokecenter.asm
@@ -1,8 +1,8 @@
-CinnabarPokecenterScript:
+CinnabarPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-CinnabarPokecenterTextPointers:
+CinnabarPokecenter_TextPointers:
 	dw CinnabarHealNurseText
 	dw CinnabarPokecenterText2
 	dw CinnabarPokecenterText3
diff --git a/scripts/colosseum.asm b/scripts/Colosseum.asm
index bdfa3c44..8cc6b056 100755
--- a/scripts/colosseum.asm
+++ b/scripts/Colosseum.asm
@@ -1,7 +1,7 @@
-ColosseumScript:
-	jp TradeCenterScript
+Colosseum_Script:
+	jp TradeCenter_Script
 
-ColosseumTextPointers:
+Colosseum_TextPointers:
 	dw ColosseumText1
 
 ColosseumText1:
diff --git a/scripts/copycatshouse1f.asm b/scripts/CopycatsHouse1F.asm
index 25cd0fc2..a86625fc 100755
--- a/scripts/copycatshouse1f.asm
+++ b/scripts/CopycatsHouse1F.asm
@@ -1,7 +1,7 @@
-CopycatsHouse1FScript:
+CopycatsHouse1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CopycatsHouse1FTextPointers:
+CopycatsHouse1F_TextPointers:
 	dw CopycatsHouse1FText1
 	dw CopycatsHouse1FText2
 	dw CopycatsHouse1FText3
diff --git a/scripts/copycatshouse2f.asm b/scripts/CopycatsHouse2F.asm
index 87946b8f..b43234c3 100755
--- a/scripts/copycatshouse2f.asm
+++ b/scripts/CopycatsHouse2F.asm
@@ -1,7 +1,7 @@
-CopycatsHouse2FScript:
+CopycatsHouse2F_Script:
 	jp EnableAutoTextBoxDrawing
 
-CopycatsHouse2FTextPointers:
+CopycatsHouse2F_TextPointers:
 	dw CopycatsHouse2FText1
 	dw CopycatsHouse2FText2
 	dw CopycatsHouse2FText3
diff --git a/scripts/daycarem.asm b/scripts/Daycare.asm
index 60daa3d5..81cf5534 100755
--- a/scripts/daycarem.asm
+++ b/scripts/Daycare.asm
@@ -1,7 +1,7 @@
-DayCareMScript:
+Daycare_Script:
 	jp EnableAutoTextBoxDrawing
 
-DayCareMTextPointers:
+Daycare_TextPointers:
 	dw DayCareMText1
 
 DayCareMText1:
diff --git a/scripts/DiglettsCave.asm b/scripts/DiglettsCave.asm
new file mode 100755
index 00000000..1d7b23f9
--- /dev/null
+++ b/scripts/DiglettsCave.asm
@@ -0,0 +1,5 @@
+DiglettsCave_Script:
+	jp EnableAutoTextBoxDrawing
+
+DiglettsCave_TextPointers:
+	db "@"
diff --git a/scripts/diglettscaveroute11.asm b/scripts/DiglettsCaveRoute11.asm
index d97a8446..54c3112e 100755
--- a/scripts/diglettscaveroute11.asm
+++ b/scripts/DiglettsCaveRoute11.asm
@@ -1,10 +1,10 @@
-DiglettsCaveEntranceRoute11Script:
+DiglettsCaveRoute11_Script:
 	call EnableAutoTextBoxDrawing
 	ld a, ROUTE_11
 	ld [wLastMap], a
 	ret
 
-DiglettsCaveEntranceRoute11TextPointers:
+DiglettsCaveRoute11_TextPointers:
 	dw DiglettsCaveEntranceRoute11Text1
 
 DiglettsCaveEntranceRoute11Text1:
diff --git a/scripts/diglettscaveroute2.asm b/scripts/DiglettsCaveRoute2.asm
index 9f061daa..5fe7777c 100755
--- a/scripts/diglettscaveroute2.asm
+++ b/scripts/DiglettsCaveRoute2.asm
@@ -1,9 +1,9 @@
-DiglettsCaveRoute2Script:
+DiglettsCaveRoute2_Script:
 	ld a, ROUTE_2
 	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
-DiglettsCaveRoute2TextPointers:
+DiglettsCaveRoute2_TextPointers:
 	dw DiglettsCaveRoute2Text1
 
 DiglettsCaveRoute2Text1:
diff --git a/scripts/fightingdojo.asm b/scripts/FightingDojo.asm
index 5c7704f5..fc691dba 100755
--- a/scripts/fightingdojo.asm
+++ b/scripts/FightingDojo.asm
@@ -1,7 +1,7 @@
-FightingDojoScript:
+FightingDojo_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, FightingDojoTrainerHeader0
-	ld de, FightingDojoScriptPointers
+	ld de, FightingDojo_ScriptPointers
 	ld a, [wFightingDojoCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wFightingDojoCurScript], a
@@ -14,7 +14,7 @@ FightingDojoScript_5cd70:
 	ld [wCurMapScript], a
 	ret
 
-FightingDojoScriptPointers:
+FightingDojo_ScriptPointers:
 	dw FightingDojoScript1
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -80,7 +80,7 @@ FightingDojoScript3:
 	ld [wCurMapScript], a
 	ret
 
-FightingDojoTextPointers:
+FightingDojo_TextPointers:
 	dw FightingDojoText1
 	dw FightingDojoText2
 	dw FightingDojoText3
diff --git a/scripts/fuchsiahouse1.asm b/scripts/FuchsiaBillsGrandpasHouse.asm
index 95e59503..ca5f2c16 100755
--- a/scripts/fuchsiahouse1.asm
+++ b/scripts/FuchsiaBillsGrandpasHouse.asm
@@ -1,8 +1,8 @@
-FuchsiaHouse1Script:
+FuchsiaBillsGrandpasHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-FuchsiaHouse1TextPointers:
+FuchsiaBillsGrandpasHouse_TextPointers:
 	dw FuchsiaHouse1Text1
 	dw FuchsiaHouse1Text2
 	dw FuchsiaHouse1Text3
diff --git a/scripts/fuchsiacity.asm b/scripts/FuchsiaCity.asm
index 74d7ee30..d3f0ce32 100755
--- a/scripts/fuchsiacity.asm
+++ b/scripts/FuchsiaCity.asm
@@ -1,7 +1,7 @@
-FuchsiaCityScript:
+FuchsiaCity_Script:
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaCityTextPointers:
+FuchsiaCity_TextPointers:
 	dw FuchsiaCityText1
 	dw FuchsiaCityText2
 	dw FuchsiaCityText3
diff --git a/scripts/fuchsiahouse3.asm b/scripts/FuchsiaGoodRodHouse.asm
index 586d62f5..93a20e80 100755
--- a/scripts/fuchsiahouse3.asm
+++ b/scripts/FuchsiaGoodRodHouse.asm
@@ -1,7 +1,7 @@
-FuchsiaHouse3Script:
+FuchsiaGoodRodHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaHouse3TextPointers:
+FuchsiaGoodRodHouse_TextPointers:
 	dw FuchsiaHouse3Text1
 
 FuchsiaHouse3Text1:
diff --git a/scripts/fuchsiagym.asm b/scripts/FuchsiaGym.asm
index 3628ebc0..c856c93b 100755
--- a/scripts/fuchsiagym.asm
+++ b/scripts/FuchsiaGym.asm
@@ -1,8 +1,8 @@
-FuchsiaGymScript:
+FuchsiaGym_Script:
 	call FuchsiaGymScript_75453
 	call EnableAutoTextBoxDrawing
 	ld hl, FuchsiaGymTrainerHeader0
-	ld de, FuchsiaGymScriptPointers
+	ld de, FuchsiaGym_ScriptPointers
 	ld a, [wFuchsiaGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wFuchsiaGymCurScript], a
@@ -30,7 +30,7 @@ FuchsiaGymScript_75477:
 	ld [wCurMapScript], a
 	ret
 
-FuchsiaGymScriptPointers:
+FuchsiaGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -70,7 +70,7 @@ FuchsiaGymScript3_75497:
 
 	jp FuchsiaGymScript_75477
 
-FuchsiaGymTextPointers:
+FuchsiaGym_TextPointers:
 	dw FuchsiaGymText1
 	dw FuchsiaGymText2
 	dw FuchsiaGymText3
diff --git a/scripts/fuchsiamart.asm b/scripts/FuchsiaMart.asm
index 96df9290..f17cac49 100755
--- a/scripts/fuchsiamart.asm
+++ b/scripts/FuchsiaMart.asm
@@ -1,7 +1,7 @@
-FuchsiaMartScript:
+FuchsiaMart_Script:
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaMartTextPointers:
+FuchsiaMart_TextPointers:
 	dw FuchsiaCashierText
 	dw FuchsiaMartText2
 	dw FuchsiaMartText3
diff --git a/scripts/fuchsiameetingroom.asm b/scripts/FuchsiaMeetingRoom.asm
index 7995a49b..95ac12fa 100755
--- a/scripts/fuchsiameetingroom.asm
+++ b/scripts/FuchsiaMeetingRoom.asm
@@ -1,8 +1,8 @@
-FuchsiaMeetingRoomScript:
+FuchsiaMeetingRoom_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-FuchsiaMeetingRoomTextPointers:
+FuchsiaMeetingRoom_TextPointers:
 	dw FuchsiaMeetingRoomText1
 	dw FuchsiaMeetingRoomText2
 	dw FuchsiaMeetingRoomText3
diff --git a/scripts/fuchsiapokecenter.asm b/scripts/FuchsiaPokecenter.asm
index a6111e84..182ec8c3 100755
--- a/scripts/fuchsiapokecenter.asm
+++ b/scripts/FuchsiaPokecenter.asm
@@ -1,8 +1,8 @@
-FuchsiaPokecenterScript:
+FuchsiaPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaPokecenterTextPointers:
+FuchsiaPokecenter_TextPointers:
 	dw FuchsiaHealNurseText
 	dw FuchsiaPokecenterText2
 	dw FuchsiaPokecenterText3
diff --git a/scripts/celadongamecorner.asm b/scripts/GameCorner.asm
index cc81b076..265508e0 100755
--- a/scripts/celadongamecorner.asm
+++ b/scripts/GameCorner.asm
@@ -1,9 +1,9 @@
-CeladonGameCornerScript:
+GameCorner_Script:
 	call CeladonGameCornerScript_48bcf
 	call CeladonGameCornerScript_48bec
 	call EnableAutoTextBoxDrawing
-	ld hl, CeladonGameCornerScriptPointers
-	ld a, [wCeladonGameCornerCurScript]
+	ld hl, GameCorner_ScriptPointers
+	ld a, [wGameCornerCurScript]
 	jp CallFunctionInTable
 
 CeladonGameCornerScript_48bcf:
@@ -38,11 +38,11 @@ CeladonGameCornerScript_48bec:
 CeladonGameCornerScript_48c07:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wCeladonGameCornerCurScript], a
+	ld [wGameCornerCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-CeladonGameCornerScriptPointers:
+GameCorner_ScriptPointers:
 	dw CeladonGameCornerScript0
 	dw CeladonGameCornerScript1
 	dw CeladonGameCornerScript2
@@ -78,7 +78,7 @@ CeladonGameCornerScript1:
 	ld [H_SPRITEINDEX], a
 	call MoveSprite
 	ld a, $2
-	ld [wCeladonGameCornerCurScript], a
+	ld [wGameCornerCurScript], a
 	ret
 
 MovementData_48c5a:
@@ -113,10 +113,10 @@ CeladonGameCornerScript2:
 	set 5, [hl]
 	set 6, [hl]
 	ld a, $0
-	ld [wCeladonGameCornerCurScript], a
+	ld [wGameCornerCurScript], a
 	ret
 
-CeladonGameCornerTextPointers:
+GameCorner_TextPointers:
 	dw CeladonGameCornerText1
 	dw CeladonGameCornerText2
 	dw CeladonGameCornerText3
@@ -427,7 +427,7 @@ CeladonGameCornerText11:
 	ld [hJoyPressed], a
 	ld [hJoyReleased], a
 	ld a, $1
-	ld [wCeladonGameCornerCurScript], a
+	ld [wGameCornerCurScript], a
 	jp TextScriptEnd
 
 CeladonGameCornerText_48ece:
diff --git a/scripts/celadonprizeroom.asm b/scripts/GameCornerPrizeRoom.asm
index a07ce162..e6cf6f0d 100755
--- a/scripts/celadonprizeroom.asm
+++ b/scripts/GameCornerPrizeRoom.asm
@@ -1,7 +1,7 @@
-CeladonPrizeRoomScript:
+GameCornerPrizeRoom_Script:
 	jp EnableAutoTextBoxDrawing
 
-CeladonPrizeRoomTextPointers:
+GameCornerPrizeRoom_TextPointers:
 	dw CeladonPrizeRoomText1
 	dw CeladonPrizeRoomText2
 	dw CeladonPrizeRoomText3
diff --git a/scripts/halloffameroom.asm b/scripts/HallOfFame.asm
index 94e64431..511c9754 100755
--- a/scripts/halloffameroom.asm
+++ b/scripts/HallOfFame.asm
@@ -1,16 +1,16 @@
-HallofFameRoomScript:
+HallOfFame_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, HallofFameRoomScriptPointers
-	ld a, [wHallOfFameRoomCurScript]
+	ld hl, HallOfFame_ScriptPointers
+	ld a, [wHallOfFameCurScript]
 	jp CallFunctionInTable
 
 HallofFameRoomScript_5a4aa:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wHallOfFameRoomCurScript], a
+	ld [wHallOfFameCurScript], a
 	ret
 
-HallofFameRoomScriptPointers:
+HallOfFame_ScriptPointers:
 	dw HallofFameRoomScript0
 	dw HallofFameRoomScript1
 	dw HallofFameRoomScript2
@@ -33,16 +33,16 @@ HallofFameRoomScript2:
 	inc hl
 	set 0, [hl]
 	xor a
-	ld hl, wLoreleiCurScript
-	ld [hli], a
-	ld [hli], a
-	ld [hl], a
-	ld [wLanceCurScript], a
-	ld [wHallOfFameRoomCurScript], a
+	ld hl, wLoreleisRoomCurScript
+	ld [hli], a ; wLoreleisRoomCurScript
+	ld [hli], a ; wBrunosRoomCurScript
+	ld [hl], a ; wAgathasRoomCurScript
+	ld [wLancesRoomCurScript], a
+	ld [wHallOfFameCurScript], a
 	; Elite 4 events
 	ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1
 	xor a
-	ld [wHallOfFameRoomCurScript], a
+	ld [wHallOfFameCurScript], a
 	ld a, PALLET_TOWN
 	ld [wLastBlackoutMap], a
 	callba SaveSAVtoSRAM
@@ -65,7 +65,7 @@ HallofFameRoomScript0:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $1
-	ld [wHallOfFameRoomCurScript], a
+	ld [wHallOfFameCurScript], a
 	ret
 
 RLEMovement5a528:
@@ -98,10 +98,10 @@ HallofFameRoomScript1:
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	ld a, $2
-	ld [wHallOfFameRoomCurScript], a
+	ld [wHallOfFameCurScript], a
 	ret
 
-HallofFameRoomTextPointers:
+HallOfFame_TextPointers:
 	dw HallofFameRoomText1
 
 HallofFameRoomText1:
diff --git a/scripts/IndigoPlateau.asm b/scripts/IndigoPlateau.asm
new file mode 100755
index 00000000..86f38b2a
--- /dev/null
+++ b/scripts/IndigoPlateau.asm
@@ -0,0 +1,4 @@
+IndigoPlateau_Script:
+	ret
+
+IndigoPlateau_TextPointers:
diff --git a/scripts/indigoplateaulobby.asm b/scripts/IndigoPlateauLobby.asm
index c26f6f0c..f83c0ba4 100755
--- a/scripts/indigoplateaulobby.asm
+++ b/scripts/IndigoPlateauLobby.asm
@@ -1,4 +1,4 @@
-IndigoPlateauLobbyScript:
+IndigoPlateauLobby_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	call EnableAutoTextBoxDrawing
 	ld hl, wCurrentMapScriptFlags
@@ -14,7 +14,7 @@ IndigoPlateauLobbyScript:
 	ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR
 	ret
 
-IndigoPlateauLobbyTextPointers:
+IndigoPlateauLobby_TextPointers:
 	dw IndigoHealNurseText
 	dw IndigoPlateauLobbyText2
 	dw IndigoPlateauLobbyText3
diff --git a/scripts/lance.asm b/scripts/LancesRoom.asm
index a0b0e6e7..5e19ea7d 100755
--- a/scripts/lance.asm
+++ b/scripts/LancesRoom.asm
@@ -1,11 +1,11 @@
-LanceScript:
+LancesRoom_Script:
 	call LanceShowOrHideEntranceBlocks
 	call EnableAutoTextBoxDrawing
 	ld hl, LanceTrainerHeader0
-	ld de, LanceScriptPointers
-	ld a, [wLanceCurScript]
+	ld de, LancesRoom_ScriptPointers
+	ld a, [wLancesRoomCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wLanceCurScript], a
+	ld [wLancesRoomCurScript], a
 	ret
 
 LanceShowOrHideEntranceBlocks:
@@ -39,10 +39,10 @@ LanceSetEntranceBlock:
 
 ResetLanceScript:
 	xor a
-	ld [wLanceCurScript], a
+	ld [wLancesRoomCurScript], a
 	ret
 
-LanceScriptPointers:
+LancesRoom_ScriptPointers:
 	dw LanceScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw LanceScript2
@@ -105,7 +105,7 @@ WalkToLance:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wLanceCurScript], a
+	ld [wLancesRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -123,11 +123,11 @@ LanceScript3:
 	call Delay3
 	xor a
 	ld [wJoyIgnore], a
-	ld [wLanceCurScript], a
+	ld [wLancesRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-LanceTextPointers:
+LancesRoom_TextPointers:
 	dw LanceText1
 
 LanceTrainerHeader0:
diff --git a/scripts/lavenderhouse2.asm b/scripts/LavenderCuboneHouse.asm
index b531c047..ff5aa732 100755
--- a/scripts/lavenderhouse2.asm
+++ b/scripts/LavenderCuboneHouse.asm
@@ -1,8 +1,8 @@
-LavenderHouse2Script:
+LavenderCuboneHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-LavenderHouse2TextPointers:
+LavenderCuboneHouse_TextPointers:
 	dw LavenderHouse2Text1
 	dw LavenderHouse2Text2
 
diff --git a/scripts/lavendermart.asm b/scripts/LavenderMart.asm
index 51b64992..47330e5d 100755
--- a/scripts/lavendermart.asm
+++ b/scripts/LavenderMart.asm
@@ -1,7 +1,7 @@
-LavenderMartScript:
+LavenderMart_Script:
 	jp EnableAutoTextBoxDrawing
 
-LavenderMartTextPointers:
+LavenderMart_TextPointers:
 	dw LavenderCashierText
 	dw LavenderMartText2
 	dw LavenderMartText3
diff --git a/scripts/lavenderpokecenter.asm b/scripts/LavenderPokecenter.asm
index 61d0b887..10482fef 100755
--- a/scripts/lavenderpokecenter.asm
+++ b/scripts/LavenderPokecenter.asm
@@ -1,8 +1,8 @@
-LavenderPokecenterScript:
+LavenderPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-LavenderPokecenterTextPointers:
+LavenderPokecenter_TextPointers:
 	dw LavenderHealNurseText
 	dw LavenderPokecenterText2
 	dw LavenderPokecenterText3
diff --git a/scripts/lavendertown.asm b/scripts/LavenderTown.asm
index daf490b1..c23996e9 100755
--- a/scripts/lavendertown.asm
+++ b/scripts/LavenderTown.asm
@@ -1,7 +1,7 @@
-LavenderTownScript:
+LavenderTown_Script:
 	jp EnableAutoTextBoxDrawing
 
-LavenderTownTextPointers:
+LavenderTown_TextPointers:
 	dw LavenderTownText1
 	dw LavenderTownText2
 	dw LavenderTownText3
diff --git a/scripts/lorelei.asm b/scripts/LoreleisRoom.asm
index ec29847a..81142377 100755
--- a/scripts/lorelei.asm
+++ b/scripts/LoreleisRoom.asm
@@ -1,11 +1,11 @@
-LoreleiScript:
+LoreleisRoom_Script:
 	call LoreleiShowOrHideExitBlock
 	call EnableAutoTextBoxDrawing
 	ld hl, LoreleiTrainerHeader0
-	ld de, LoreleiScriptPointers
-	ld a, [wLoreleiCurScript]
+	ld de, LoreleisRoom_ScriptPointers
+	ld a, [wLoreleisRoomCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wLoreleiCurScript], a
+	ld [wLoreleisRoomCurScript], a
 	ret
 
 LoreleiShowOrHideExitBlock:
@@ -29,10 +29,10 @@ LoreleiShowOrHideExitBlock:
 
 ResetLoreleiScript:
 	xor a
-	ld [wLoreleiCurScript], a
+	ld [wLoreleisRoomCurScript], a
 	ret
 
-LoreleiScriptPointers:
+LoreleisRoom_ScriptPointers:
 	dw LoreleiScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw LoreleiScript2
@@ -56,7 +56,7 @@ LoreleiScriptWalkIntoRoom:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wLoreleiCurScript], a
+	ld [wLoreleisRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -84,7 +84,7 @@ LoreleiScript0:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wLoreleiCurScript], a
+	ld [wLoreleisRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -102,7 +102,7 @@ LoreleiScript3:
 	call Delay3
 	xor a
 	ld [wJoyIgnore], a
-	ld [wLoreleiCurScript], a
+	ld [wLoreleisRoomCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -115,7 +115,7 @@ LoreleiScript2:
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-LoreleiTextPointers:
+LoreleisRoom_TextPointers:
 	dw LoreleiText1
 	dw LoreleiDontRunAwayText
 
diff --git a/scripts/lavenderhouse1.asm b/scripts/MrFujisHouse.asm
index 91b9286b..98190cd8 100755
--- a/scripts/lavenderhouse1.asm
+++ b/scripts/MrFujisHouse.asm
@@ -1,8 +1,8 @@
-LavenderHouse1Script:
+MrFujisHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-LavenderHouse1TextPointers:
+MrFujisHouse_TextPointers:
 	dw LavenderHouse1Text1
 	dw LavenderHouse1Text2
 	dw LavenderHouse1Text3
diff --git a/scripts/saffronhouse2.asm b/scripts/MrPsychicsHouse.asm
index 10c3d29e..7d4f54c0 100755
--- a/scripts/saffronhouse2.asm
+++ b/scripts/MrPsychicsHouse.asm
@@ -1,7 +1,7 @@
-SaffronHouse2Script:
+MrPsychicsHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-SaffronHouse2TextPointers:
+MrPsychicsHouse_TextPointers:
 	dw SaffronHouse2Text1
 
 SaffronHouse2Text1:
diff --git a/scripts/mtmoon1.asm b/scripts/MtMoon1F.asm
index 5ee3d025..b05b3f60 100755
--- a/scripts/mtmoon1.asm
+++ b/scripts/MtMoon1F.asm
@@ -1,18 +1,18 @@
-MtMoon1Script:
+MtMoon1F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, MtMoon1TrainerHeader0
-	ld de, MtMoon1ScriptPointers
-	ld a, [wMtMoon1CurScript]
+	ld de, MtMoon1F_ScriptPointers
+	ld a, [wMtMoon1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wMtMoon1CurScript], a
+	ld [wMtMoon1FCurScript], a
 	ret
 
-MtMoon1ScriptPointers:
+MtMoon1F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-MtMoon1TextPointers:
+MtMoon1F_TextPointers:
 	dw MtMoon1Text1
 	dw MtMoon1Text2
 	dw MtMoon1Text3
diff --git a/scripts/mtmoon2.asm b/scripts/MtMoonB1F.asm
index 6d1e5339..779812c3 100755
--- a/scripts/mtmoon2.asm
+++ b/scripts/MtMoonB1F.asm
@@ -1,8 +1,8 @@
-MtMoon2Script:
+MtMoonB1F_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-MtMoon2TextPointers:
+MtMoonB1F_TextPointers:
 	dw MtMoonText1
 
 MtMoonText1:
diff --git a/scripts/mtmoon3.asm b/scripts/MtMoonB2F.asm
index 60cd1ab8..863d9d22 100755
--- a/scripts/mtmoon3.asm
+++ b/scripts/MtMoonB2F.asm
@@ -1,10 +1,10 @@
-MtMoon3Script:
+MtMoonB2F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, MtMoon3TrainerHeader0
-	ld de, MtMoon3ScriptPointers
-	ld a, [wMtMoon3CurScript]
+	ld de, MtMoonB2F_ScriptPointers
+	ld a, [wMtMoonB2FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wMtMoon3CurScript], a
+	ld [wMtMoonB2FCurScript], a
 	CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
 	ret z
 	ld hl, CoordsData_49d37
@@ -40,11 +40,11 @@ CoordsData_49d37:
 MtMoon3Script_49d58:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wMtMoon3CurScript], a
+	ld [wMtMoonB2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-MtMoon3ScriptPointers:
+MtMoonB2F_ScriptPointers:
 	dw MtMoon3Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -82,7 +82,7 @@ MtMoon3Script3:
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
-	ld [wMtMoon3CurScript], a
+	ld [wMtMoonB2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -105,7 +105,7 @@ MtMoon3Script4:
 	ld [H_SPRITEINDEX], a
 	call MoveSprite
 	ld a, $5
-	ld [wMtMoon3CurScript], a
+	ld [wMtMoonB2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -140,21 +140,21 @@ MtMoon3Script5:
 	call DisplayTextID
 	CheckEvent EVENT_GOT_DOME_FOSSIL
 	jr z, .asm_49e1d
-	ld a, HS_MT_MOON_3_FOSSIL_2
+	ld a, HS_MT_MOON_B2F_FOSSIL_2
 	jr .asm_49e1f
 .asm_49e1d
-	ld a, HS_MT_MOON_3_FOSSIL_1
+	ld a, HS_MT_MOON_B2F_FOSSIL_1
 .asm_49e1f
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
-	ld [wMtMoon3CurScript], a
+	ld [wMtMoonB2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-MtMoon3TextPointers:
+MtMoonB2F_TextPointers:
 	dw MtMoon3Text1
 	dw MtMoon3Text2
 	dw MtMoon3Text3
@@ -227,7 +227,7 @@ MtMoon3Text1:
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $3
-	ld [wMtMoon3CurScript], a
+	ld [wMtMoonB2FCurScript], a
 	ld [wCurMapScript], a
 	jr .asm_49ebe
 .asm_49eb8
@@ -274,12 +274,12 @@ MtMoon3Text6:
 	call GiveItem
 	jp nc, MtMoon3Script_49f76
 	call MtMoon3Script_49f69
-	ld a, HS_MT_MOON_3_FOSSIL_1
+	ld a, HS_MT_MOON_B2F_FOSSIL_1
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	SetEvent EVENT_GOT_DOME_FOSSIL
 	ld a, $4
-	ld [wMtMoon3CurScript], a
+	ld [wMtMoonB2FCurScript], a
 	ld [wCurMapScript], a
 .asm_49f21
 	jp TextScriptEnd
@@ -302,12 +302,12 @@ MtMoon3Text7:
 	call GiveItem
 	jp nc, MtMoon3Script_49f76
 	call MtMoon3Script_49f69
-	ld a, HS_MT_MOON_3_FOSSIL_2
+	ld a, HS_MT_MOON_B2F_FOSSIL_2
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	SetEvent EVENT_GOT_HELIX_FOSSIL
 	ld a, $4
-	ld [wMtMoon3CurScript], a
+	ld [wMtMoonB2FCurScript], a
 	ld [wCurMapScript], a
 .asm_49f61
 	jp TextScriptEnd
diff --git a/scripts/mtmoonpokecenter.asm b/scripts/MtMoonPokecenter.asm
index b5edee8d..969031db 100755
--- a/scripts/mtmoonpokecenter.asm
+++ b/scripts/MtMoonPokecenter.asm
@@ -1,8 +1,8 @@
-MtMoonPokecenterScript:
+MtMoonPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-MtMoonPokecenterTextPointers:
+MtMoonPokecenter_TextPointers:
 	dw MtMoonHealNurseText
 	dw MtMoonPokecenterText2
 	dw MtMoonPokecenterText3
diff --git a/scripts/museum1f.asm b/scripts/Museum1F.asm
index 35bfb446..712f1fc4 100755
--- a/scripts/museum1f.asm
+++ b/scripts/Museum1F.asm
@@ -1,13 +1,13 @@
-Museum1FScript:
+Museum1F_Script:
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, Museum1FScriptPointers
-	ld a, [wMuseum1fCurScript]
+	ld hl, Museum1F_ScriptPointers
+	ld a, [wMuseum1FCurScript]
 	jp CallFunctionInTable
 
-Museum1FScriptPointers:
+Museum1F_ScriptPointers:
 	dw Museum1FScript0
 	dw Museum1FScript1
 
@@ -31,7 +31,7 @@ Museum1FScript0:
 Museum1FScript1:
 	ret
 
-Museum1FTextPointers:
+Museum1F_TextPointers:
 	dw Museum1FText1
 	dw Museum1FText2
 	dw Museum1FText3
@@ -120,7 +120,7 @@ Museum1FText1:
 	jr Museum1FScriptEnd
 .asm_0b094
 	ld a, $1
-	ld [wMuseum1fCurScript], a
+	ld [wMuseum1FCurScript], a
 	jr Museum1FScriptEnd
 
 Museum1FScript_5c1f9:
diff --git a/scripts/museum2f.asm b/scripts/Museum2F.asm
index 6ee8d72a..ce4d3d81 100755
--- a/scripts/museum2f.asm
+++ b/scripts/Museum2F.asm
@@ -1,7 +1,7 @@
-Museum2FScript:
+Museum2F_Script:
 	jp EnableAutoTextBoxDrawing
 
-Museum2FTextPointers:
+Museum2F_TextPointers:
 	dw Museum2FText1
 	dw Museum2FText2
 	dw Museum2FText3
diff --git a/scripts/namerater.asm b/scripts/NameRatersHouse.asm
index 160948ac..323cb360 100755
--- a/scripts/namerater.asm
+++ b/scripts/NameRatersHouse.asm
@@ -1,4 +1,4 @@
-NameRaterScript:
+NameRatersHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
 NameRaterScript_1da15:
@@ -37,7 +37,7 @@ NameRaterScript_1da20:
 	scf
 	ret
 
-NameRaterTextPointers:
+NameRatersHouse_TextPointers:
 	dw NameRaterText1
 
 NameRaterText1:
diff --git a/scripts/oakslab.asm b/scripts/OaksLab.asm
index aa84fab9..364b157b 100755
--- a/scripts/oakslab.asm
+++ b/scripts/OaksLab.asm
@@ -1,15 +1,15 @@
-OaksLabScript:
+OaksLab_Script:
 	CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2
 	call nz, OaksLabScript_1d076
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
-	ld hl, OaksLabScriptPointers
+	ld hl, OaksLab_ScriptPointers
 	ld a, [wOaksLabCurScript]
 	jp CallFunctionInTable
 
-OaksLabScriptPointers:
+OaksLab_ScriptPointers:
 	dw OaksLabScript0
 	dw OaksLabScript1
 	dw OaksLabScript2
@@ -712,14 +712,14 @@ OaksLabScript_1d02b:
 	ret
 
 OaksLabScript_1d076:
-	ld hl, OaksLabTextPointers2
+	ld hl, OaksLab_TextPointers2
 	ld a, l
 	ld [wMapTextPtr], a
 	ld a, h
 	ld [wMapTextPtr+1], a
 	ret
 
-OaksLabTextPointers:
+OaksLab_TextPointers:
 	dw OaksLabText1
 	dw OaksLabText2
 	dw OaksLabText3
@@ -748,7 +748,7 @@ OaksLabTextPointers:
 	dw OaksLabText26
 	dw OaksLabText27
 
-OaksLabTextPointers2:
+OaksLab_TextPointers2:
 	dw OaksLabText1
 	dw OaksLabText2
 	dw OaksLabText3
diff --git a/scripts/pallettown.asm b/scripts/PalletTown.asm
index 5b2d2a35..5ad7d40f 100755
--- a/scripts/pallettown.asm
+++ b/scripts/PalletTown.asm
@@ -1,14 +1,14 @@
-PalletTownScript:
+PalletTown_Script:
 	CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK
 	jr z, .next
 	SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS
 .next
 	call EnableAutoTextBoxDrawing
-	ld hl, PalletTownScriptPointers
+	ld hl, PalletTown_ScriptPointers
 	ld a, [wPalletTownCurScript]
 	jp CallFunctionInTable
 
-PalletTownScriptPointers:
+PalletTown_ScriptPointers:
 	dw PalletTownScript0
 	dw PalletTownScript1
 	dw PalletTownScript2
@@ -148,7 +148,7 @@ PalletTownScript5:
 PalletTownScript6:
 	ret
 
-PalletTownTextPointers:
+PalletTown_TextPointers:
 	dw PalletTownText1
 	dw PalletTownText2
 	dw PalletTownText3
diff --git a/scripts/pewtercity.asm b/scripts/PewterCity.asm
index 80acede8..dcc449c1 100755
--- a/scripts/pewtercity.asm
+++ b/scripts/PewterCity.asm
@@ -1,10 +1,10 @@
-PewterCityScript:
+PewterCity_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PewterCityScriptPointers
+	ld hl, PewterCity_ScriptPointers
 	ld a, [wPewterCityCurScript]
 	jp CallFunctionInTable
 
-PewterCityScriptPointers:
+PewterCity_ScriptPointers:
 	dw PewterCityScript0
 	dw PewterCityScript1
 	dw PewterCityScript2
@@ -15,7 +15,7 @@ PewterCityScriptPointers:
 
 PewterCityScript0:
 	xor a
-	ld [wMuseum1fCurScript], a
+	ld [wMuseum1FCurScript], a
 	ResetEvent EVENT_BOUGHT_MUSEUM_TICKET
 	call PewterCityScript_1925e
 	ret
@@ -176,7 +176,7 @@ PewterCityScript6:
 	ld [wPewterCityCurScript], a
 	ret
 
-PewterCityTextPointers:
+PewterCity_TextPointers:
 	dw PewterCityText1
 	dw PewterCityText2
 	dw PewterCityText3
diff --git a/scripts/pewtergym.asm b/scripts/PewterGym.asm
index 2cfee6c0..6dd24b08 100755
--- a/scripts/pewtergym.asm
+++ b/scripts/PewterGym.asm
@@ -1,11 +1,11 @@
-PewterGymScript:
+PewterGym_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, PewterGymScript_5c3a4
 	call EnableAutoTextBoxDrawing
 	ld hl, PewterGymTrainerHeader0
-	ld de, PewterGymScriptPointers
+	ld de, PewterGym_ScriptPointers
 	ld a, [wPewterGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wPewterGymCurScript], a
@@ -29,7 +29,7 @@ PewterGymScript_5c3bf:
 	ld [wCurMapScript], a
 	ret
 
-PewterGymScriptPointers:
+PewterGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -79,7 +79,7 @@ PewterGymScript_5c3df:
 
 	jp PewterGymScript_5c3bf
 
-PewterGymTextPointers:
+PewterGym_TextPointers:
 	dw PewterGymText1
 	dw PewterGymText2
 	dw PewterGymText3
diff --git a/scripts/pewtermart.asm b/scripts/PewterMart.asm
index d5281704..c71f8413 100755
--- a/scripts/pewtermart.asm
+++ b/scripts/PewterMart.asm
@@ -1,10 +1,10 @@
-PewterMartScript:
+PewterMart_Script:
 	call EnableAutoTextBoxDrawing
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	ret
 
-PewterMartTextPointers:
+PewterMart_TextPointers:
 	dw PewterCashierText
 	dw PewterMartText2
 	dw PewterMartText3
diff --git a/scripts/pewterhouse1.asm b/scripts/PewterNidoranHouse.asm
index 8fa8dc3c..a4e85e08 100755
--- a/scripts/pewterhouse1.asm
+++ b/scripts/PewterNidoranHouse.asm
@@ -1,7 +1,7 @@
-PewterHouse1Script:
+PewterNidoranHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-PewterHouse1TextPointers:
+PewterNidoranHouse_TextPointers:
 	dw PewterHouse1Text1
 	dw PewterHouse1Text2
 	dw PewterHouse1Text3
diff --git a/scripts/pewterpokecenter.asm b/scripts/PewterPokecenter.asm
index 4dd63559..68115050 100755
--- a/scripts/pewterpokecenter.asm
+++ b/scripts/PewterPokecenter.asm
@@ -1,8 +1,8 @@
-PewterPokecenterScript:
+PewterPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-PewterPokecenterTextPointers:
+PewterPokecenter_TextPointers:
 	dw PewterHealNurseText
 	dw PewterPokecenterText2
 	dw PewterJigglypuffText
diff --git a/scripts/pewterhouse2.asm b/scripts/PewterSpeechHouse.asm
index e3bbe01e..943e1759 100755
--- a/scripts/pewterhouse2.asm
+++ b/scripts/PewterSpeechHouse.asm
@@ -1,7 +1,7 @@
-PewterHouse2Script:
+PewterSpeechHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-PewterHouse2TextPointers:
+PewterSpeechHouse_TextPointers:
 	dw PewterHouse2Text1
 	dw PewterHouse2Text2
 
diff --git a/scripts/fanclub.asm b/scripts/PokemonFanClub.asm
index b6d65586..673d6011 100755
--- a/scripts/fanclub.asm
+++ b/scripts/PokemonFanClub.asm
@@ -1,4 +1,4 @@
-FanClubScript:
+PokemonFanClub_Script:
 	jp EnableAutoTextBoxDrawing
 
 FanClubBikeInBag:
@@ -11,7 +11,7 @@ FanClubBikeInBag:
 	ld b, BIKE_VOUCHER
 	jp IsItemInBag
 
-FanClubTextPointers:
+PokemonFanClub_TextPointers:
 	dw FanClubText1
 	dw FanClubText2
 	dw FanClubText3
diff --git a/scripts/mansion1.asm b/scripts/PokemonMansion1F.asm
index 2fdc18c6..41f40635 100755
--- a/scripts/mansion1.asm
+++ b/scripts/PokemonMansion1F.asm
@@ -1,11 +1,11 @@
-Mansion1Script:
+PokemonMansion1F_Script:
 	call Mansion1Subscript1
 	call EnableAutoTextBoxDrawing
 	ld hl, Mansion1TrainerHeader0
-	ld de, Mansion1ScriptPointers
-	ld a, [wMansion1CurScript]
+	ld de, PokemonMansion1F_ScriptPointers
+	ld a, [wPokemonMansion1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wMansion1CurScript], a
+	ld [wPokemonMansion1FCurScript], a
 	ret
 
 Mansion1Subscript1:
@@ -55,12 +55,12 @@ Mansion1Script_Switches:
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Mansion1ScriptPointers:
+PokemonMansion1F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Mansion1TextPointers:
+PokemonMansion1F_TextPointers:
 	dw Mansion1Text1
 	dw PickUpItemText
 	dw PickUpItemText
diff --git a/scripts/mansion2.asm b/scripts/PokemonMansion2F.asm
index ddc1ff7a..a7b90bcd 100755
--- a/scripts/mansion2.asm
+++ b/scripts/PokemonMansion2F.asm
@@ -1,11 +1,11 @@
-Mansion2Script:
+PokemonMansion2F_Script:
 	call Mansion2Script_51fee
 	call EnableAutoTextBoxDrawing
 	ld hl, Mansion2TrainerHeader0
-	ld de, Mansion2ScriptPointers
-	ld a, [wMansion2CurScript]
+	ld de, PokemonMansion2F_ScriptPointers
+	ld a, [wPokemonMansion2FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wMansion2CurScript], a
+	ld [wPokemonMansion2FCurScript], a
 	ret
 
 Mansion2Script_51fee:
@@ -51,12 +51,12 @@ Mansion2Script_Switches:
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Mansion2ScriptPointers:
+PokemonMansion2F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Mansion2TextPointers:
+PokemonMansion2F_TextPointers:
 	dw Mansion2Text1
 	dw PickUpItemText
 	dw Mansion2Text3
diff --git a/scripts/mansion3.asm b/scripts/PokemonMansion3F.asm
index abe76df8..3edc7bfd 100755
--- a/scripts/mansion3.asm
+++ b/scripts/PokemonMansion3F.asm
@@ -1,11 +1,11 @@
-Mansion3Script:
+PokemonMansion3F_Script:
 	call Mansion3Script_52204
 	call EnableAutoTextBoxDrawing
 	ld hl, Mansion3TrainerHeader0
-	ld de, Mansion3ScriptPointers
-	ld a, [wMansion3CurScript]
+	ld de, PokemonMansion3F_ScriptPointers
+	ld a, [wPokemonMansion3FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wMansion3CurScript], a
+	ld [wPokemonMansion3FCurScript], a
 	ret
 
 Mansion3Script_52204:
@@ -31,7 +31,7 @@ Mansion3Script_52204:
 	call Mansion2Script_5202f
 	ret
 
-Mansion3ScriptPointers:
+PokemonMansion3F_ScriptPointers:
 	dw Mansion3Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -82,7 +82,7 @@ Mansion3Script_Switches:
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Mansion3TextPointers:
+PokemonMansion3F_TextPointers:
 	dw Mansion3Text1
 	dw Mansion3Text2
 	dw PickUpItemText
diff --git a/scripts/mansion4.asm b/scripts/PokemonMansionB1F.asm
index de8a5d58..887b4762 100755
--- a/scripts/mansion4.asm
+++ b/scripts/PokemonMansionB1F.asm
@@ -1,11 +1,11 @@
-Mansion4Script:
+PokemonMansionB1F_Script:
 	call Mansion4Script_523cf
 	call EnableAutoTextBoxDrawing
 	ld hl, Mansion4TrainerHeader0
-	ld de, Mansion4ScriptPointers
-	ld a, [wMansion4CurScript]
+	ld de, PokemonMansionB1F_ScriptPointers
+	ld a, [wPokemonMansionB1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wMansion4CurScript], a
+	ld [wPokemonMansionB1FCurScript], a
 	ret
 
 Mansion4Script_523cf:
@@ -53,12 +53,12 @@ Mansion4Script_Switches:
 	ld [hSpriteIndexOrTextID], a
 	jp DisplayTextID
 
-Mansion4ScriptPointers:
+PokemonMansionB1F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Mansion4TextPointers:
+PokemonMansionB1F_TextPointers:
 	dw Mansion4Text1
 	dw Mansion4Text2
 	dw PickUpItemText
diff --git a/scripts/pokemontower1.asm b/scripts/PokemonTower1F.asm
index 6d9d1b3f..66b5505c 100755
--- a/scripts/pokemontower1.asm
+++ b/scripts/PokemonTower1F.asm
@@ -1,7 +1,7 @@
-PokemonTower1Script:
+PokemonTower1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-PokemonTower1TextPointers:
+PokemonTower1F_TextPointers:
 	dw PokemonTower1Text1
 	dw PokemonTower1Text2
 	dw PokemonTower1Text3
diff --git a/scripts/pokemontower2.asm b/scripts/PokemonTower2F.asm
index 383b175d..81f4c0b3 100755
--- a/scripts/pokemontower2.asm
+++ b/scripts/PokemonTower2F.asm
@@ -1,17 +1,17 @@
-PokemonTower2Script:
+PokemonTower2F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, PokemonTower2ScriptPointers
-	ld a, [wPokemonTower2CurScript]
+	ld hl, PokemonTower2F_ScriptPointers
+	ld a, [wPokemonTower2FCurScript]
 	jp CallFunctionInTable
 
 PokemonTower2Script_604fe:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wPokemonTower2CurScript], a
+	ld [wPokemonTower2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower2ScriptPointers:
+PokemonTower2F_ScriptPointers:
 	dw PokemonTower2Script0
 	dw PokemonTower2Script1
 	dw PokemonTower2Script2
@@ -81,7 +81,7 @@ PokemonTower2Script1:
 	call PlaySound
 	callba Music_RivalAlternateStart
 	ld a, $2
-	ld [wPokemonTower2CurScript], a
+	ld [wPokemonTower2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -111,18 +111,18 @@ PokemonTower2Script2:
 	ld a, [wd730]
 	bit 0, a
 	ret nz
-	ld a, HS_POKEMONTOWER_2_RIVAL
+	ld a, HS_POKEMON_TOWER_2F_RIVAL
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	xor a
 	ld [wJoyIgnore], a
 	call PlayDefaultMusic
 	ld a, $0
-	ld [wPokemonTower2CurScript], a
+	ld [wPokemonTower2FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower2TextPointers:
+PokemonTower2F_TextPointers:
 	dw PokemonTower2Text1
 	dw PokemonTower2Text2
 
@@ -162,7 +162,7 @@ PokemonTower2Text1:
 	ld [wTrainerNo], a
 
 	ld a, $1
-	ld [wPokemonTower2CurScript], a
+	ld [wPokemonTower2FCurScript], a
 	ld [wCurMapScript], a
 .asm_41852
 	jp TextScriptEnd
diff --git a/scripts/pokemontower3.asm b/scripts/PokemonTower3F.asm
index 6027b450..7d8f63e9 100755
--- a/scripts/pokemontower3.asm
+++ b/scripts/PokemonTower3F.asm
@@ -1,18 +1,18 @@
-PokemonTower3Script:
+PokemonTower3F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, PokemonTower3TrainerHeader0
-	ld de, PokemonTower3ScriptPointers
-	ld a, [wPokemonTower3CurScript]
+	ld de, PokemonTower3F_ScriptPointers
+	ld a, [wPokemonTower3FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wPokemonTower3CurScript], a
+	ld [wPokemonTower3FCurScript], a
 	ret
 
-PokemonTower3ScriptPointers:
+PokemonTower3F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-PokemonTower3TextPointers:
+PokemonTower3F_TextPointers:
 	dw PokemonTower3Text1
 	dw PokemonTower3Text2
 	dw PokemonTower3Text3
diff --git a/scripts/pokemontower4.asm b/scripts/PokemonTower4F.asm
index a8307c01..b8e0d772 100755
--- a/scripts/pokemontower4.asm
+++ b/scripts/PokemonTower4F.asm
@@ -1,18 +1,18 @@
-PokemonTower4Script:
+PokemonTower4F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, PokemonTower4TrainerHeader0
-	ld de, PokemonTower4ScriptPointers
-	ld a, [wPokemonTower4CurScript]
+	ld de, PokemonTower4F_ScriptPointers
+	ld a, [wPokemonTower4FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wPokemonTower4CurScript], a
+	ld [wPokemonTower4FCurScript], a
 	ret
 
-PokemonTower4ScriptPointers:
+PokemonTower4F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-PokemonTower4TextPointers:
+PokemonTower4F_TextPointers:
 	dw PokemonTower4Text1
 	dw PokemonTower4Text2
 	dw PokemonTower4Text3
diff --git a/scripts/pokemontower5.asm b/scripts/PokemonTower5F.asm
index 9a13f286..299261e9 100755
--- a/scripts/pokemontower5.asm
+++ b/scripts/PokemonTower5F.asm
@@ -1,13 +1,13 @@
-PokemonTower5Script:
+PokemonTower5F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, PokemonTower5TrainerHeader0
-	ld de, PokemonTower5ScriptPointers
-	ld a, [wPokemonTower5CurScript]
+	ld de, PokemonTower5F_ScriptPointers
+	ld a, [wPokemonTower5FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wPokemonTower5CurScript], a
+	ld [wPokemonTower5FCurScript], a
 	ret
 
-PokemonTower5ScriptPointers:
+PokemonTower5F_ScriptPointers:
 	dw PokemonTower5Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -48,7 +48,7 @@ CoordsData_60992:
 	db $09,$0B
 	db $FF
 
-PokemonTower5TextPointers:
+PokemonTower5F_TextPointers:
 	dw PokemonTower5Text1
 	dw PokemonTower5Text2
 	dw PokemonTower5Text3
diff --git a/scripts/pokemontower6.asm b/scripts/PokemonTower6F.asm
index c3118f62..14c07c48 100755
--- a/scripts/pokemontower6.asm
+++ b/scripts/PokemonTower6F.asm
@@ -1,20 +1,20 @@
-PokemonTower6Script:
+PokemonTower6F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, PokemonTower6TrainerHeader0
-	ld de, PokemonTower6ScriptPointers
-	ld a, [wPokemonTower6CurScript]
+	ld de, PokemonTower6F_ScriptPointers
+	ld a, [wPokemonTower6FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wPokemonTower6CurScript], a
+	ld [wPokemonTower6FCurScript], a
 	ret
 
 PokemonTower6Script_60b02:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wPokemonTower6CurScript], a
+	ld [wPokemonTower6FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower6ScriptPointers:
+PokemonTower6F_ScriptPointers:
 	dw PokemonTower6Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -37,7 +37,7 @@ PokemonTower6Script0:
 	ld a, 30
 	ld [wCurEnemyLVL], a
 	ld a, $4
-	ld [wPokemonTower6CurScript], a
+	ld [wPokemonTower6FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -66,7 +66,7 @@ PokemonTower6Script4:
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
-	ld [wPokemonTower6CurScript], a
+	ld [wPokemonTower6FCurScript], a
 	ld [wCurMapScript], a
 	ret
 .asm_60b82
@@ -80,7 +80,7 @@ PokemonTower6Script4:
 	ld hl, wd730
 	set 7, [hl]
 	ld a, $3
-	ld [wPokemonTower6CurScript], a
+	ld [wPokemonTower6FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -90,11 +90,11 @@ PokemonTower6Script3:
 	ret nz
 	call Delay3
 	xor a
-	ld [wPokemonTower6CurScript], a
+	ld [wPokemonTower6FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower6TextPointers:
+PokemonTower6F_TextPointers:
 	dw PokemonTower6Text1
 	dw PokemonTower6Text2
 	dw PokemonTower6Text3
diff --git a/scripts/pokemontower7.asm b/scripts/PokemonTower7F.asm
index 88c62c53..4b2a1827 100755
--- a/scripts/pokemontower7.asm
+++ b/scripts/PokemonTower7F.asm
@@ -1,20 +1,20 @@
-PokemonTower7Script:
+PokemonTower7F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, PokemonTower7TrainerHeader0
-	ld de, PokemonTower7ScriptPointers
-	ld a, [wPokemonTower7CurScript]
+	ld de, PokemonTower7F_ScriptPointers
+	ld a, [wPokemonTower7FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wPokemonTower7CurScript], a
+	ld [wPokemonTower7FCurScript], a
 	ret
 
 PokemonTower7Script_60d18:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wPokemonTower7CurScript], a
+	ld [wPokemonTower7FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-PokemonTower7ScriptPointers:
+PokemonTower7F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw PokemonTower7Script2
@@ -35,7 +35,7 @@ PokemonTower7Script2:
 	call DisplayTextID
 	call PokemonTower7Script_60db6
 	ld a, $3
-	ld [wPokemonTower7CurScript], a
+	ld [wPokemonTower7FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -59,19 +59,19 @@ PokemonTower7Script3:
 	ld [wTrainerHeaderFlagBit], a
 	ld [wUnusedDA38], a
 	ld a, $0
-	ld [wPokemonTower7CurScript], a
+	ld [wPokemonTower7FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
 PokemonTower7Script4:
 	ld a, $ff
 	ld [wJoyIgnore], a
-	ld a, HS_POKEMONTOWER_7_MR_FUJI
+	ld a, HS_POKEMON_TOWER_7F_MR_FUJI
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	ld a, SPRITE_FACING_UP
 	ld [wSpriteStateData1 + 9], a
-	ld a, LAVENDER_HOUSE_1
+	ld a, MR_FUJIS_HOUSE
 	ld [hWarpDestinationMap], a
 	ld a, $1
 	ld [wDestinationWarpID], a
@@ -80,7 +80,7 @@ PokemonTower7Script4:
 	ld hl, wd72d
 	set 3, [hl]
 	ld a, $0
-	ld [wPokemonTower7CurScript], a
+	ld [wPokemonTower7FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
@@ -198,7 +198,7 @@ MovementData_60e37:
 	db NPC_MOVEMENT_DOWN
 	db $FF
 
-PokemonTower7TextPointers:
+PokemonTower7F_TextPointers:
 	dw PokemonTower7Text1
 	dw PokemonTower7Text2
 	dw PokemonTower7Text3
@@ -257,7 +257,7 @@ PokemonTower7FujiText:
 	call PrintText
 	SetEvent EVENT_RESCUED_MR_FUJI
 	SetEvent EVENT_RESCUED_MR_FUJI_2
-	ld a, HS_LAVENDER_HOUSE_1_MR_FUJI
+	ld a, HS_MR_FUJIS_HOUSE_MR_FUJI
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	ld a, HS_SAFFRON_CITY_E
@@ -267,7 +267,7 @@ PokemonTower7FujiText:
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	ld a, $4
-	ld [wPokemonTower7CurScript], a
+	ld [wPokemonTower7FCurScript], a
 	ld [wCurMapScript], a
 	jp TextScriptEnd
 
diff --git a/scripts/powerplant.asm b/scripts/PowerPlant.asm
index 5391585d..35b4893f 100755
--- a/scripts/powerplant.asm
+++ b/scripts/PowerPlant.asm
@@ -1,18 +1,18 @@
-PowerPlantScript:
+PowerPlant_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Voltorb0TrainerHeader
-	ld de, .ScriptPointers
+	ld de, PowerPlant_ScriptPointers
 	ld a, [wPowerPlantCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wPowerPlantCurScript], a
 	ret
 
-.ScriptPointers
+PowerPlant_ScriptPointers
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-PowerPlantTextPointers:
+PowerPlant_TextPointers:
 	dw Voltorb0Text
 	dw Voltorb1Text
 	dw Voltorb2Text
diff --git a/scripts/redshouse1f.asm b/scripts/RedsHouse1F.asm
index 59323b8e..b982d71c 100755
--- a/scripts/redshouse1f.asm
+++ b/scripts/RedsHouse1F.asm
@@ -1,7 +1,7 @@
-RedsHouse1FScript:
+RedsHouse1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-RedsHouse1FTextPointers:
+RedsHouse1F_TextPointers:
 	dw RedsHouse1FText1
 	dw RedsHouse1FText2
 
diff --git a/scripts/redshouse2f.asm b/scripts/RedsHouse2F.asm
index 0ec59077..5ec86678 100755
--- a/scripts/redshouse2f.asm
+++ b/scripts/RedsHouse2F.asm
@@ -1,10 +1,10 @@
-RedsHouse2FScript:
+RedsHouse2F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, RedsHouse2FScriptPointers
-	ld a, [wRedsHouse2CurScript]
+	ld hl, RedsHouse2F_ScriptPointers
+	ld a, [wRedsHouse2FCurScript]
 	jp CallFunctionInTable
 
-RedsHouse2FScriptPointers:
+RedsHouse2F_ScriptPointers:
 	dw RedsHouse2FScript0
 	dw RedsHouse2FScript1
 
@@ -14,11 +14,11 @@ RedsHouse2FScript0:
 	ld a, PLAYER_DIR_UP
 	ld [wPlayerMovingDirection], a
 	ld a, 1
-	ld [wRedsHouse2CurScript], a
+	ld [wRedsHouse2FCurScript], a
 	ret
 
 RedsHouse2FScript1:
 	ret
 
-RedsHouse2FTextPointers:
+RedsHouse2F_TextPointers:
 	db "@"
diff --git a/scripts/rocktunnel1.asm b/scripts/RockTunnel1F.asm
index 390330e8..94620d96 100755
--- a/scripts/rocktunnel1.asm
+++ b/scripts/RockTunnel1F.asm
@@ -1,18 +1,18 @@
-RockTunnel1Script:
+RockTunnel1F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, RockTunnel1TrainerHeader0
-	ld de, RockTunnel1ScriptPointers
-	ld a, [wRockTunnel1CurScript]
+	ld de, RockTunnel1F_ScriptPointers
+	ld a, [wRockTunnel1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wRockTunnel1CurScript], a
+	ld [wRockTunnel1FCurScript], a
 	ret
 
-RockTunnel1ScriptPointers:
+RockTunnel1F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-RockTunnel1TextPointers:
+RockTunnel1F_TextPointers:
 	dw RockTunnel1Text1
 	dw RockTunnel1Text2
 	dw RockTunnel1Text3
diff --git a/scripts/rocktunnel2.asm b/scripts/RockTunnelB1F.asm
index 4385b5f7..7e6fcc8b 100755
--- a/scripts/rocktunnel2.asm
+++ b/scripts/RockTunnelB1F.asm
@@ -1,18 +1,18 @@
-RockTunnel2Script:
+RockTunnelB1F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, RockTunnel2TrainerHeader0
-	ld de, RockTunnel2ScriptPointers
-	ld a, [wRockTunnel2CurScript]
+	ld de, RockTunnelB1F_ScriptPointers
+	ld a, [wRockTunnelB1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wRockTunnel2CurScript], a
+	ld [wRockTunnelB1FCurScript], a
 	ret
 
-RockTunnel2ScriptPointers:
+RockTunnelB1F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-RockTunnel2TextPointers:
+RockTunnelB1F_TextPointers:
 	dw RockTunnel2Text1
 	dw RockTunnel2Text2
 	dw RockTunnel2Text3
diff --git a/scripts/rocktunnelpokecenter.asm b/scripts/RockTunnelPokecenter.asm
index 7bcdc1ae..cbcd6318 100755
--- a/scripts/rocktunnelpokecenter.asm
+++ b/scripts/RockTunnelPokecenter.asm
@@ -1,8 +1,8 @@
-RockTunnelPokecenterScript:
+RockTunnelPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-RockTunnelPokecenterTextPointers:
+RockTunnelPokecenter_TextPointers:
 	dw RockTunnelHealNurseText
 	dw RockTunnelPokecenterText2
 	dw RockTunnelPokecenterText3
diff --git a/scripts/rockethideout1.asm b/scripts/RocketHideoutB1F.asm
index 88b3a7e9..0cbddb49 100755
--- a/scripts/rockethideout1.asm
+++ b/scripts/RocketHideoutB1F.asm
@@ -1,11 +1,11 @@
-RocketHideout1Script:
+RocketHideoutB1F_Script:
 	call RocketHideout1Script_44be0
 	call EnableAutoTextBoxDrawing
 	ld hl, RocketHideout1TrainerHeader0
-	ld de, RocketHideout1ScriptPointers
-	ld a, [wRocketHideout1CurScript]
+	ld de, RocketHideoutB1F_ScriptPointers
+	ld a, [wRocketHideoutB1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wRocketHideout1CurScript], a
+	ld [wRocketHideoutB1FCurScript], a
 	ret
 
 RocketHideout1Script_44be0:
@@ -30,12 +30,12 @@ RocketHideout1Script_44be0:
 	lb bc, 8, 12
 	predef_jump ReplaceTileBlock
 
-RocketHideout1ScriptPointers:
+RocketHideoutB1F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-RocketHideout1TextPointers:
+RocketHideoutB1F_TextPointers:
 	dw RocketHideout1Text1
 	dw RocketHideout1Text2
 	dw RocketHideout1Text3
diff --git a/scripts/rockethideout2.asm b/scripts/RocketHideoutB2F.asm
index c5f026d5..1b487df2 100755
--- a/scripts/rockethideout2.asm
+++ b/scripts/RocketHideoutB2F.asm
@@ -1,13 +1,13 @@
-RocketHideout2Script:
+RocketHideoutB2F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, RocketHideout2TrainerHeader0
-	ld de, RocketHideout2ScriptPointers
-	ld a, [wRocketHideout2CurScript]
+	ld de, RocketHideoutB2F_ScriptPointers
+	ld a, [wRocketHideoutB2FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wRocketHideout2CurScript], a
+	ld [wRocketHideoutB2FCurScript], a
 	ret
 
-RocketHideout2ScriptPointers:
+RocketHideoutB2F_ScriptPointers:
 	dw RocketHideout2Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -413,7 +413,7 @@ SpinnerPlayerFacingDirections:
 SpinnerArrowAnimTiles:
 	INCBIN "gfx/spinner_arrow.2bpp"
 
-RocketHideout2TextPointers:
+RocketHideoutB2F_TextPointers:
 	dw RocketHideout2Text1
 	dw PickUpItemText
 	dw PickUpItemText
diff --git a/scripts/rockethideout3.asm b/scripts/RocketHideoutB3F.asm
index 00a61568..4dd537b3 100755
--- a/scripts/rockethideout3.asm
+++ b/scripts/RocketHideoutB3F.asm
@@ -1,13 +1,13 @@
-RocketHideout3Script:
+RocketHideoutB3F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, RocketHideout3TrainerHeader0
-	ld de, RocketHideout3ScriptPointers
-	ld a, [wRocketHideout3CurScript]
+	ld de, RocketHideoutB3F_ScriptPointers
+	ld a, [wRocketHideoutB3FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wRocketHideout3CurScript], a
+	ld [wRocketHideoutB3FCurScript], a
 	ret
 
-RocketHideout3ScriptPointers:
+RocketHideoutB3F_ScriptPointers:
 	dw RocketHideout3Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -143,7 +143,7 @@ RocketHideout3Script3:
 	ld [wCurMapScript], a
 	ret
 
-RocketHideout3TextPointers:
+RocketHideoutB3F_TextPointers:
 	dw RocketHideout3Text1
 	dw RocketHideout3Text2
 	dw PickUpItemText
diff --git a/scripts/rockethideout4.asm b/scripts/RocketHideoutB4F.asm
index e8361988..b2ce21f4 100755
--- a/scripts/rockethideout4.asm
+++ b/scripts/RocketHideoutB4F.asm
@@ -1,11 +1,11 @@
-RocketHideout4Script:
+RocketHideoutB4F_Script:
 	call RocketHideout4Script_45473
 	call EnableAutoTextBoxDrawing
 	ld hl, RocketHideout4TrainerHeader0
-	ld de, RocketHideout4ScriptPointers
-	ld a, [wRocketHideout4CurScript]
+	ld de, RocketHideoutB4F_ScriptPointers
+	ld a, [wRocketHideoutB4FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wRocketHideout4CurScript], a
+	ld [wRocketHideoutB4FCurScript], a
 	ret
 
 RocketHideout4Script_45473:
@@ -33,11 +33,11 @@ RocketHideout4Script_45473:
 RocketHideout4Script_454a3:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wRocketHideout4CurScript], a
+	ld [wRocketHideoutB4FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-RocketHideout4ScriptPointers:
+RocketHideoutB4F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -55,10 +55,10 @@ RocketHideout4Script3:
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	call GBFadeOutToBlack
-	ld a, HS_ROCKET_HIDEOUT_4_GIOVANNI
+	ld a, HS_ROCKET_HIDEOUT_B4F_GIOVANNI
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	ld a, HS_ROCKET_HIDEOUT_4_ITEM_4
+	ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_4
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	call UpdateSprites
@@ -68,11 +68,11 @@ RocketHideout4Script3:
 	ld hl, wCurrentMapScriptFlags
 	set 5, [hl]
 	ld a, $0
-	ld [wRocketHideout4CurScript], a
+	ld [wRocketHideoutB4FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-RocketHideout4TextPointers:
+RocketHideoutB4F_TextPointers:
 	dw RocketHideout4Text1
 	dw RocketHideout4Text2
 	dw RocketHideout4Text3
@@ -132,7 +132,7 @@ RocketHideout4Text1:
 	xor a
 	ld [hJoyHeld], a
 	ld a, $3
-	ld [wRocketHideout4CurScript], a
+	ld [wRocketHideoutB4FCurScript], a
 	ld [wCurMapScript], a
 	jr .asm_209f0
 .asm_545571
@@ -209,7 +209,7 @@ RocketHideout4AfterBattleText4:
 	call PrintText
 	CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY
 	jr nz, .asm_455e9
-	ld a, HS_ROCKET_HIDEOUT_4_ITEM_5
+	ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_5
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 .asm_455e9
diff --git a/scripts/rockethideoutelevator.asm b/scripts/RocketHideoutElevator.asm
index aed0f0cf..9525db3a 100755
--- a/scripts/rockethideoutelevator.asm
+++ b/scripts/RocketHideoutElevator.asm
@@ -1,4 +1,4 @@
-RocketHideoutElevatorScript:
+RocketHideoutElevator_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -51,9 +51,9 @@ RocketHideoutElevatorWarpMaps:
 ; first byte is warp number
 ; second byte is map number
 ; These specify where the player goes after getting out of the elevator.
-	db $04, ROCKET_HIDEOUT_1
-	db $04, ROCKET_HIDEOUT_2
-	db $02, ROCKET_HIDEOUT_4
+	db $04, ROCKET_HIDEOUT_B1F
+	db $04, ROCKET_HIDEOUT_B2F
+	db $02, ROCKET_HIDEOUT_B4F
 RocketHideoutElevatorWarpMapsEnd:
 
 RocketHideoutElevatorScript_4575f:
@@ -61,7 +61,7 @@ RocketHideoutElevatorScript_4575f:
 	callba ShakeElevator
 	ret
 
-RocketHideoutElevatorTextPointers:
+RocketHideoutElevator_TextPointers:
 	dw RocketHideoutElevatorText1
 
 RocketHideoutElevatorText1:
diff --git a/scripts/route1.asm b/scripts/Route1.asm
index 7f988fab..e733b54d 100755
--- a/scripts/route1.asm
+++ b/scripts/Route1.asm
@@ -1,7 +1,7 @@
-Route1Script:
+Route1_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route1TextPointers:
+Route1_TextPointers:
 	dw Route1Text1
 	dw Route1Text2
 	dw Route1Text3
diff --git a/scripts/route10.asm b/scripts/Route10.asm
index 03a1e818..3fffa2c0 100755
--- a/scripts/route10.asm
+++ b/scripts/Route10.asm
@@ -1,18 +1,18 @@
-Route10Script:
+Route10_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route10TrainerHeader0
-	ld de, Route10ScriptPointers
+	ld de, Route10_ScriptPointers
 	ld a, [wRoute10CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute10CurScript], a
 	ret
 
-Route10ScriptPointers:
+Route10_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route10TextPointers:
+Route10_TextPointers:
 	dw Route10Text1
 	dw Route10Text2
 	dw Route10Text3
diff --git a/scripts/route11.asm b/scripts/Route11.asm
index afedfc32..891237cc 100755
--- a/scripts/route11.asm
+++ b/scripts/Route11.asm
@@ -1,18 +1,18 @@
-Route11Script:
+Route11_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route11TrainerHeader0
-	ld de, Route11ScriptPointers
+	ld de, Route11_ScriptPointers
 	ld a, [wRoute11CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute11CurScript], a
 	ret
 
-Route11ScriptPointers:
+Route11_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route11TextPointers:
+Route11_TextPointers:
 	dw Route11Text1
 	dw Route11Text2
 	dw Route11Text3
diff --git a/scripts/route11gate.asm b/scripts/Route11Gate1F.asm
index 9ecfe0ca..8e5f6c03 100755
--- a/scripts/route11gate.asm
+++ b/scripts/Route11Gate1F.asm
@@ -1,7 +1,7 @@
-Route11GateScript:
+Route11Gate1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route11GateTextPointers:
+Route11Gate1F_TextPointers:
 	dw Route11GateText1
 
 Route11GateText1:
diff --git a/scripts/route11gateupstairs.asm b/scripts/Route11Gate2F.asm
index 6c8d6e99..c140937d 100755
--- a/scripts/route11gateupstairs.asm
+++ b/scripts/Route11Gate2F.asm
@@ -1,7 +1,7 @@
-Route11GateUpstairsScript:
+Route11Gate2F_Script:
 	jp DisableAutoTextBoxDrawing
 
-Route11GateUpstairsTextPointers:
+Route11Gate2F_TextPointers:
 	dw Route11GateUpstairsText1
 	dw Route11GateUpstairsText2
 	dw Route11GateUpstairsText3
diff --git a/scripts/route12.asm b/scripts/Route12.asm
index 07b5833b..510e7727 100755
--- a/scripts/route12.asm
+++ b/scripts/Route12.asm
@@ -1,7 +1,7 @@
-Route12Script:
+Route12_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route12TrainerHeader0
-	ld de, Route12ScriptPointers
+	ld de, Route12_ScriptPointers
 	ld a, [wRoute12CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute12CurScript], a
@@ -14,7 +14,7 @@ Route12Script_59606:
 	ld [wCurMapScript], a
 	ret
 
-Route12ScriptPointers:
+Route12_ScriptPointers:
 	dw Route12Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -60,7 +60,7 @@ Route12Script3:
 	ld [wCurMapScript], a
 	ret
 
-Route12TextPointers:
+Route12_TextPointers:
 	dw Route12Text1
 	dw Route12Text2
 	dw Route12Text3
diff --git a/scripts/route12gate.asm b/scripts/Route12Gate1F.asm
index 8474100d..52d427ee 100755
--- a/scripts/route12gate.asm
+++ b/scripts/Route12Gate1F.asm
@@ -1,7 +1,7 @@
-Route12GateScript:
+Route12Gate1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route12GateTextPointers:
+Route12Gate1F_TextPointers:
 	dw Route12GateText1
 
 Route12GateText1:
diff --git a/scripts/route12gateupstairs.asm b/scripts/Route12Gate2F.asm
index cd355265..0cc2768b 100755
--- a/scripts/route12gateupstairs.asm
+++ b/scripts/Route12Gate2F.asm
@@ -1,7 +1,7 @@
-Route12GateUpstairsScript:
+Route12Gate2F_Script:
 	jp DisableAutoTextBoxDrawing
 
-Route12GateUpstairsTextPointers:
+Route12Gate2F_TextPointers:
 	dw Route12GateUpstairsText1
 	dw Route12GateUpstairsText2
 	dw Route12GateUpstairsText3
diff --git a/scripts/route12house.asm b/scripts/Route12SuperRodHouse.asm
index 4b93395f..de8ed8f0 100755
--- a/scripts/route12house.asm
+++ b/scripts/Route12SuperRodHouse.asm
@@ -1,7 +1,7 @@
-Route12HouseScript:
+Route12SuperRodHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route12HouseTextPointers:
+Route12SuperRodHouse_TextPointers:
 	dw Route12HouseText1
 
 Route12HouseText1:
diff --git a/scripts/route13.asm b/scripts/Route13.asm
index 54fb9d68..8f92147e 100755
--- a/scripts/route13.asm
+++ b/scripts/Route13.asm
@@ -1,18 +1,18 @@
-Route13Script:
+Route13_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route13TrainerHeader0
-	ld de, Route13ScriptPointers
+	ld de, Route13_ScriptPointers
 	ld a, [wRoute13CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute13CurScript], a
 	ret
 
-Route13ScriptPointers:
+Route13_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route13TextPointers:
+Route13_TextPointers:
 	dw Route13Text1
 	dw Route13Text2
 	dw Route13Text3
diff --git a/scripts/route14.asm b/scripts/Route14.asm
index c929451f..fdc84d74 100755
--- a/scripts/route14.asm
+++ b/scripts/Route14.asm
@@ -1,18 +1,18 @@
-Route14Script:
+Route14_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route14TrainerHeader0
-	ld de, Route14ScriptPointers
+	ld de, Route14_ScriptPointers
 	ld a, [wRoute14CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute14CurScript], a
 	ret
 
-Route14ScriptPointers:
+Route14_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route14TextPointers:
+Route14_TextPointers:
 	dw Route14Text1
 	dw Route14Text2
 	dw Route14Text3
diff --git a/scripts/route15.asm b/scripts/Route15.asm
index 58c5d0ab..d973eb9c 100755
--- a/scripts/route15.asm
+++ b/scripts/Route15.asm
@@ -1,18 +1,18 @@
-Route15Script:
+Route15_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route15TrainerHeader0
-	ld de, Route15ScriptPointers
+	ld de, Route15_ScriptPointers
 	ld a, [wRoute15CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute15CurScript], a
 	ret
 
-Route15ScriptPointers:
+Route15_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route15TextPointers:
+Route15_TextPointers:
 	dw Route15Text1
 	dw Route15Text2
 	dw Route15Text3
diff --git a/scripts/route15gate.asm b/scripts/Route15Gate1F.asm
index 40db02dd..910eb2a5 100755
--- a/scripts/route15gate.asm
+++ b/scripts/Route15Gate1F.asm
@@ -1,7 +1,7 @@
-Route15GateScript:
+Route15Gate1F_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route15GateTextPointers:
+Route15Gate1F_TextPointers:
 	dw Route15GateText1
 
 Route15GateText1:
diff --git a/scripts/route15gateupstairs.asm b/scripts/Route15Gate2F.asm
index c7f6a2ad..83763762 100755
--- a/scripts/route15gateupstairs.asm
+++ b/scripts/Route15Gate2F.asm
@@ -1,7 +1,7 @@
-Route15GateUpstairsScript:
+Route15Gate2F_Script:
 	jp DisableAutoTextBoxDrawing
 
-Route15GateUpstairsTextPointers:
+Route15Gate2F_TextPointers:
 	dw Route15GateUpstairsText1
 	dw Route15GateUpstairsText2
 
diff --git a/scripts/route16.asm b/scripts/Route16.asm
index 20431608..54f83380 100755
--- a/scripts/route16.asm
+++ b/scripts/Route16.asm
@@ -1,7 +1,7 @@
-Route16Script:
+Route16_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route16TrainerHeader0
-	ld de, Route16ScriptPointers
+	ld de, Route16_ScriptPointers
 	ld a, [wRoute16CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute16CurScript], a
@@ -14,7 +14,7 @@ Route16Script_59946:
 	ld [wCurMapScript], a
 	ret
 
-Route16ScriptPointers:
+Route16_ScriptPointers:
 	dw Route16Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -61,7 +61,7 @@ Route16Script3:
 	ld [wCurMapScript], a
 	ret
 
-Route16TextPointers:
+Route16_TextPointers:
 	dw Route16Text1
 	dw Route16Text2
 	dw Route16Text3
diff --git a/scripts/route16house.asm b/scripts/Route16FlyHouse.asm
index 5359248c..1d74ac80 100755
--- a/scripts/route16house.asm
+++ b/scripts/Route16FlyHouse.asm
@@ -1,7 +1,7 @@
-Route16HouseScript:
+Route16FlyHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route16HouseTextPointers:
+Route16FlyHouse_TextPointers:
 	dw Route16HouseText1
 	dw Route16HouseText2
 
diff --git a/scripts/route16gate.asm b/scripts/Route16Gate1F.asm
index e20ba6f7..f814d209 100755
--- a/scripts/route16gate.asm
+++ b/scripts/Route16Gate1F.asm
@@ -1,12 +1,12 @@
-Route16GateScript:
+Route16Gate1F_Script:
 	ld hl, wd732
 	res 5, [hl]
 	call EnableAutoTextBoxDrawing
-	ld a, [wRoute16GateCurScript]
-	ld hl, Route16GateScriptPointers
+	ld a, [wRoute16Gate1FCurScript]
+	ld hl, Route16Gate1F_ScriptPointers
 	jp CallFunctionInTable
 
-Route16GateScriptPointers:
+Route16Gate1F_ScriptPointers:
 	dw Route16GateScript0
 	dw Route16GateScript1
 	dw Route16GateScript2
@@ -36,11 +36,11 @@ Route16GateScript0:
 	call FillMemory
 	call StartSimulatingJoypadStates
 	ld a, $1
-	ld [wRoute16GateCurScript], a
+	ld [wRoute16Gate1FCurScript], a
 	ret
 .asm_4970e
 	ld a, $2
-	ld [wRoute16GateCurScript], a
+	ld [wRoute16Gate1FCurScript], a
 	ret
 
 CoordsData_49714:
@@ -67,7 +67,7 @@ Route16GateScript2:
 	ld [wSimulatedJoypadStatesEnd], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wRoute16GateCurScript], a
+	ld [wRoute16Gate1FCurScript], a
 	ret
 
 Route16GateScript3:
@@ -79,14 +79,14 @@ Route16GateScript3:
 	ld hl, wd730
 	res 7, [hl]
 	ld a, $0
-	ld [wRoute16GateCurScript], a
+	ld [wRoute16Gate1FCurScript], a
 	ret
 
 Route16GateScript_49755:
 	ld b, BICYCLE
 	jp IsItemInBag
 
-Route16GateTextPointers:
+Route16Gate1F_TextPointers:
 	dw Route16GateText1
 	dw Route16GateText2
 	dw Route16GateText3
diff --git a/scripts/route16gateupstairs.asm b/scripts/Route16Gate2F.asm
index 664976a2..643a5ec7 100755
--- a/scripts/route16gateupstairs.asm
+++ b/scripts/Route16Gate2F.asm
@@ -1,7 +1,7 @@
-Route16GateUpstairsScript:
+Route16Gate2F_Script:
 	jp DisableAutoTextBoxDrawing
 
-Route16GateUpstairsTextPointers:
+Route16Gate2F_TextPointers:
 	dw Route16GateUpstairsText1
 	dw Route16GateUpstairsText2
 	dw Route16GateUpstairsText3
diff --git a/scripts/route17.asm b/scripts/Route17.asm
index fb9f4cd8..dd92ac44 100755
--- a/scripts/route17.asm
+++ b/scripts/Route17.asm
@@ -1,18 +1,18 @@
-Route17Script:
+Route17_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route17TrainerHeader0
-	ld de, Route17ScriptPointers
+	ld de, Route17_ScriptPointers
 	ld a, [wRoute17CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute17CurScript], a
 	ret
 
-Route17ScriptPointers:
+Route17_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route17TextPointers:
+Route17_TextPointers:
 	dw Route17Text1
 	dw Route17Text2
 	dw Route17Text3
diff --git a/scripts/route18.asm b/scripts/Route18.asm
index 687b269c..022d41be 100755
--- a/scripts/route18.asm
+++ b/scripts/Route18.asm
@@ -1,18 +1,18 @@
-Route18Script:
+Route18_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route18TrainerHeader0
-	ld de, Route18ScriptPointers
+	ld de, Route18_ScriptPointers
 	ld a, [wRoute18CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute18CurScript], a
 	ret
 
-Route18ScriptPointers:
+Route18_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route18TextPointers:
+Route18_TextPointers:
 	dw Route18Text1
 	dw Route18Text2
 	dw Route18Text3
diff --git a/scripts/route18gate.asm b/scripts/Route18Gate1F.asm
index 893801a1..812cb3e0 100755
--- a/scripts/route18gate.asm
+++ b/scripts/Route18Gate1F.asm
@@ -1,12 +1,12 @@
-Route18GateScript:
+Route18Gate1F_Script:
 	ld hl, wd732
 	res 5, [hl]
 	call EnableAutoTextBoxDrawing
-	ld a, [wRoute18GateCurScript]
-	ld hl, Route18GateScriptPointers
+	ld a, [wRoute18Gate1FCurScript]
+	ld hl, Route18Gate1F_ScriptPointers
 	jp CallFunctionInTable
 
-Route18GateScriptPointers:
+Route18Gate1F_ScriptPointers:
 	dw Route18GateScript0
 	dw Route18GateScript1
 	dw Route18GateScript2
@@ -36,11 +36,11 @@ Route18GateScript0:
 	call FillMemory
 	call StartSimulatingJoypadStates
 	ld a, $1
-	ld [wRoute18GateCurScript], a
+	ld [wRoute18Gate1FCurScript], a
 	ret
 .asm_498c6
 	ld a, $2
-	ld [wRoute18GateCurScript], a
+	ld [wRoute18Gate1FCurScript], a
 	ret
 
 CoordsData_498cc:
@@ -67,7 +67,7 @@ Route18GateScript2:
 	ld [wSimulatedJoypadStatesEnd], a
 	call StartSimulatingJoypadStates
 	ld a, $3
-	ld [wRoute18GateCurScript], a
+	ld [wRoute18Gate1FCurScript], a
 	ret
 
 Route18GateScript3:
@@ -79,10 +79,10 @@ Route18GateScript3:
 	ld hl, wd730
 	res 7, [hl]
 	ld a, $0
-	ld [wRoute18GateCurScript], a
+	ld [wRoute18Gate1FCurScript], a
 	ret
 
-Route18GateTextPointers:
+Route18Gate1F_TextPointers:
 	dw Route18GateText1
 	dw Route18GateText2
 
diff --git a/scripts/route18gateupstairs.asm b/scripts/Route18Gate2F.asm
index 3d623142..6987a099 100755
--- a/scripts/route18gateupstairs.asm
+++ b/scripts/Route18Gate2F.asm
@@ -1,7 +1,7 @@
-Route18GateUpstairsScript:
+Route18Gate2F_Script:
 	jp DisableAutoTextBoxDrawing
 
-Route18GateUpstairsTextPointers:
+Route18Gate2F_TextPointers:
 	dw Route18GateUpstairsText1
 	dw Route18GateUpstairsText2
 	dw Route18GateUpstairsText3
diff --git a/scripts/route19.asm b/scripts/Route19.asm
index 01ea5dce..6f603e05 100755
--- a/scripts/route19.asm
+++ b/scripts/Route19.asm
@@ -1,18 +1,18 @@
-Route19Script:
+Route19_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route19TrainerHeader0
-	ld de, Route19ScriptPointers
+	ld de, Route19_ScriptPointers
 	ld a, [wRoute19CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute19CurScript], a
 	ret
 
-Route19ScriptPointers:
+Route19_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route19TextPointers:
+Route19_TextPointers:
 	dw Route19Text1
 	dw Route19Text2
 	dw Route19Text3
diff --git a/scripts/route2.asm b/scripts/Route2.asm
index 810792ef..f4b1c8c4 100755
--- a/scripts/route2.asm
+++ b/scripts/Route2.asm
@@ -1,7 +1,7 @@
-Route2Script:
+Route2_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route2TextPointers:
+Route2_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw Route2Text3
diff --git a/scripts/route20.asm b/scripts/Route20.asm
index 53ff5e55..081a723e 100755
--- a/scripts/route20.asm
+++ b/scripts/Route20.asm
@@ -1,9 +1,9 @@
-Route20Script:
+Route20_Script:
 	CheckAndResetEvent EVENT_IN_SEAFOAM_ISLANDS
 	call nz, Route20Script_50cc6
 	call EnableAutoTextBoxDrawing
 	ld hl, Route20TrainerHeader0
-	ld de, Route20ScriptPointers
+	ld de, Route20_ScriptPointers
 	ld a, [wRoute20CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute20CurScript], a
@@ -12,9 +12,9 @@ Route20Script:
 Route20Script_50cc6:
 	CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
 	jr z, .asm_50cef
-	ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1
 	call Route20Script_50d0c
-	ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2
 	call Route20Script_50d0c
 	ld hl, .MissableObjectIDs
 .asm_50cdc
@@ -27,24 +27,24 @@ Route20Script_50cc6:
 	jr .asm_50cdc
 
 .MissableObjectIDs:
-	db HS_SEAFOAM_ISLANDS_2_BOULDER_1
-	db HS_SEAFOAM_ISLANDS_2_BOULDER_2
-	db HS_SEAFOAM_ISLANDS_3_BOULDER_1
-	db HS_SEAFOAM_ISLANDS_3_BOULDER_2
-	db HS_SEAFOAM_ISLANDS_4_BOULDER_3
-	db HS_SEAFOAM_ISLANDS_4_BOULDER_4
+	db HS_SEAFOAM_ISLANDS_B1F_BOULDER_1
+	db HS_SEAFOAM_ISLANDS_B1F_BOULDER_2
+	db HS_SEAFOAM_ISLANDS_B2F_BOULDER_1
+	db HS_SEAFOAM_ISLANDS_B2F_BOULDER_2
+	db HS_SEAFOAM_ISLANDS_B3F_BOULDER_3
+	db HS_SEAFOAM_ISLANDS_B3F_BOULDER_4
 	db $FF
 
 .asm_50cef
 	CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE
 	ret z
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1
 	call Route20Script_50d0c
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2
 	call Route20Script_50d0c
-	ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1
 	call Route20Script_50d14
-	ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2
 	call Route20Script_50d14
 	ret
 
@@ -56,12 +56,12 @@ Route20Script_50d14:
 	ld [wMissableObjectIndex], a
 	predef_jump HideObject
 
-Route20ScriptPointers:
+Route20_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route20TextPointers:
+Route20_TextPointers:
 	dw Route20Text1
 	dw Route20Text2
 	dw Route20Text3
diff --git a/scripts/route21.asm b/scripts/Route21.asm
index dcdc8022..15dacd5d 100755
--- a/scripts/route21.asm
+++ b/scripts/Route21.asm
@@ -1,18 +1,18 @@
-Route21Script:
+Route21_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route21TrainerHeader0
-	ld de, Route21ScriptPointers
+	ld de, Route21_ScriptPointers
 	ld a, [wRoute21CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute21CurScript], a
 	ret
 
-Route21ScriptPointers:
+Route21_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route21TextPointers:
+Route21_TextPointers:
 	dw Route21Text1
 	dw Route21Text2
 	dw Route21Text3
diff --git a/scripts/route22.asm b/scripts/Route22.asm
index 86c3768b..7226e509 100755
--- a/scripts/route22.asm
+++ b/scripts/Route22.asm
@@ -1,10 +1,10 @@
-Route22Script:
+Route22_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route22ScriptPointers
+	ld hl, Route22_ScriptPointers
 	ld a, [wRoute22CurScript]
 	jp CallFunctionInTable
 
-Route22ScriptPointers:
+Route22_ScriptPointers:
 	dw Route22Script0
 	dw Route22Script1
 	dw Route22Script2
@@ -377,7 +377,7 @@ Route22Script6:
 	ld [wRoute22CurScript], a
 	ret
 
-Route22TextPointers:
+Route22_TextPointers:
 	dw Route22Text1
 	dw Route22Text2
 	dw Route22FrontGateText
diff --git a/scripts/route22gate.asm b/scripts/Route22Gate.asm
index ee2e5b6b..86b1220d 100755
--- a/scripts/route22gate.asm
+++ b/scripts/Route22Gate.asm
@@ -1,6 +1,6 @@
-Route22GateScript:
+Route22Gate_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route22GateScriptPointers
+	ld hl, Route22Gate_ScriptPointers
 	ld a, [wRoute22GateCurScript]
 	call CallFunctionInTable
 	ld a, [wYCoord]
@@ -12,7 +12,7 @@ Route22GateScript:
 	ld [wLastMap], a
 	ret
 
-Route22GateScriptPointers:
+Route22Gate_ScriptPointers:
 	dw Route22GateScript0
 	dw Route22GateScript1
 	dw Route22GateScript2
@@ -53,7 +53,7 @@ Route22GateScript1:
 Route22GateScript2:
 	ret
 
-Route22GateTextPointers:
+Route22Gate_TextPointers:
 	dw Route22GateText1
 
 Route22GateText1:
diff --git a/scripts/route23.asm b/scripts/Route23.asm
index 4eb6b5f7..e91e2c98 100755
--- a/scripts/route23.asm
+++ b/scripts/Route23.asm
@@ -1,7 +1,7 @@
-Route23Script:
+Route23_Script:
 	call Route23Script_511e9
 	call EnableAutoTextBoxDrawing
-	ld hl, Route23ScriptPointers
+	ld hl, Route23_ScriptPointers
 	ld a, [wRoute23CurScript]
 	jp CallFunctionInTable
 
@@ -12,14 +12,14 @@ Route23Script_511e9:
 	ret z
 	ResetEvents EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2
 	ResetEvents EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2
-	ld a, HS_VICTORY_ROAD_3_BOULDER
+	ld a, HS_VICTORY_ROAD_3F_BOULDER
 	ld [wMissableObjectIndex], a
 	predef ShowObject
-	ld a, HS_VICTORY_ROAD_2_BOULDER
+	ld a, HS_VICTORY_ROAD_2F_BOULDER
 	ld [wMissableObjectIndex], a
 	predef_jump HideObject
 
-Route23ScriptPointers:
+Route23_ScriptPointers:
 	dw Route23Script0
 	dw Route23Script1
 	dw Route23Script2
@@ -131,7 +131,7 @@ Route23Script2:
 	ld [wRoute23CurScript], a
 	ret
 
-Route23TextPointers:
+Route23_TextPointers:
 	dw Route23Text1
 	dw Route23Text2
 	dw Route23Text3
diff --git a/scripts/route24.asm b/scripts/Route24.asm
index f55d2268..a8e16e7d 100755
--- a/scripts/route24.asm
+++ b/scripts/Route24.asm
@@ -1,7 +1,7 @@
-Route24Script:
+Route24_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route24TrainerHeader0
-	ld de, Route24ScriptPointers
+	ld de, Route24_ScriptPointers
 	ld a, [wRoute24CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute24CurScript], a
@@ -14,7 +14,7 @@ Route24Script_513c0:
 	ld [wCurMapScript], a
 	ret
 
-Route24ScriptPointers:
+Route24_ScriptPointers:
 	dw Route24Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -75,7 +75,7 @@ Route24Script3:
 	ld [wCurMapScript], a
 	ret
 
-Route24TextPointers:
+Route24_TextPointers:
 	dw Route24Text1
 	dw Route24Text2
 	dw Route24Text3
diff --git a/scripts/route25.asm b/scripts/Route25.asm
index c83c725b..7166919d 100755
--- a/scripts/route25.asm
+++ b/scripts/Route25.asm
@@ -1,8 +1,8 @@
-Route25Script:
+Route25_Script:
 	call Route25Script_515e1
 	call EnableAutoTextBoxDrawing
 	ld hl, Route25TrainerHeader0
-	ld de, Route25ScriptPointers
+	ld de, Route25_ScriptPointers
 	ld a, [wRoute25CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute25CurScript], a
@@ -35,12 +35,12 @@ Route25Script_515e1:
 	ld [wMissableObjectIndex], a
 	predef_jump ShowObject
 
-Route25ScriptPointers:
+Route25_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route25TextPointers:
+Route25_TextPointers:
 	dw Route25Text1
 	dw Route25Text2
 	dw Route25Text3
diff --git a/scripts/route2gate.asm b/scripts/Route2Gate.asm
index 34f1aa35..70d93814 100755
--- a/scripts/route2gate.asm
+++ b/scripts/Route2Gate.asm
@@ -1,7 +1,7 @@
-Route2GateScript:
+Route2Gate_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route2GateTextPointers:
+Route2Gate_TextPointers:
 	dw Route2GateText1
 	dw Route2GateText2
 
diff --git a/scripts/route2house.asm b/scripts/Route2TradeHouse.asm
index 95055aec..a89e2fe9 100755
--- a/scripts/route2house.asm
+++ b/scripts/Route2TradeHouse.asm
@@ -1,7 +1,7 @@
-Route2HouseScript:
+Route2TradeHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route2HouseTextPointers:
+Route2TradeHouse_TextPointers:
 	dw Route2HouseText1
 	dw Route2HouseText2
 
diff --git a/scripts/route3.asm b/scripts/Route3.asm
index e4748b8c..d55831bf 100755
--- a/scripts/route3.asm
+++ b/scripts/Route3.asm
@@ -1,18 +1,18 @@
-Route3Script:
+Route3_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route3TrainerHeader0
-	ld de, Route3ScriptPointers
+	ld de, Route3_ScriptPointers
 	ld a, [wRoute3CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute3CurScript], a
 	ret
 
-Route3ScriptPointers:
+Route3_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route3TextPointers:
+Route3_TextPointers:
 	dw Route3Text1
 	dw Route3Text2
 	dw Route3Text3
diff --git a/scripts/route4.asm b/scripts/Route4.asm
index ee9e2cdf..9b04a47a 100755
--- a/scripts/route4.asm
+++ b/scripts/Route4.asm
@@ -1,18 +1,18 @@
-Route4Script:
+Route4_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route4TrainerHeader0
-	ld de, Route4ScriptPointers
+	ld de, Route4_ScriptPointers
 	ld a, [wRoute4CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute4CurScript], a
 	ret
 
-Route4ScriptPointers:
+Route4_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route4TextPointers:
+Route4_TextPointers:
 	dw Route4Text1
 	dw Route4Text2
 	dw PickUpItemText
diff --git a/scripts/route5.asm b/scripts/Route5.asm
index 113212a4..1b2bd242 100755
--- a/scripts/route5.asm
+++ b/scripts/Route5.asm
@@ -1,7 +1,7 @@
-Route5Script:
+Route5_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route5TextPointers:
+Route5_TextPointers:
 	dw Route5Text1
 
 Route5Text1:
diff --git a/scripts/route5gate.asm b/scripts/Route5Gate.asm
index 6072f943..bc763dfd 100755
--- a/scripts/route5gate.asm
+++ b/scripts/Route5Gate.asm
@@ -1,10 +1,10 @@
-Route5GateScript:
+Route5Gate_Script:
 	call EnableAutoTextBoxDrawing
 	ld a, [wRoute5GateCurScript]
-	ld hl, Route5GateScriptPointers
+	ld hl, Route5Gate_ScriptPointers
 	jp CallFunctionInTable
 
-Route5GateScriptPointers:
+Route5Gate_ScriptPointers:
 	dw Route5GateScript0
 	dw Route5GateScript1
 
@@ -60,7 +60,7 @@ Route5GateScript1:
 	ld [wRoute5GateCurScript], a
 	ret
 
-Route5GateTextPointers:
+Route5Gate_TextPointers:
 	dw Route5GateText1
 	dw Route5GateText2
 	dw Route5GateText3
diff --git a/scripts/route6.asm b/scripts/Route6.asm
index ba727adc..9f43b800 100755
--- a/scripts/route6.asm
+++ b/scripts/Route6.asm
@@ -1,18 +1,18 @@
-Route6Script:
+Route6_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route6TrainerHeader0
-	ld de, Route6ScriptPointers
+	ld de, Route6_ScriptPointers
 	ld a, [wRoute6CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute6CurScript], a
 	ret
 
-Route6ScriptPointers:
+Route6_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route6TextPointers:
+Route6_TextPointers:
 	dw Route6Text1
 	dw Route6Text2
 	dw Route6Text3
diff --git a/scripts/route6gate.asm b/scripts/Route6Gate.asm
index cf872f69..348f61ac 100755
--- a/scripts/route6gate.asm
+++ b/scripts/Route6Gate.asm
@@ -1,11 +1,11 @@
-Route6GateScript:
+Route6Gate_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route6GateScriptPointers
+	ld hl, Route6Gate_ScriptPointers
 	ld a, [wRoute6GateCurScript]
 	call CallFunctionInTable
 	ret
 
-Route6GateScriptPointers:
+Route6Gate_ScriptPointers:
 	dw Route6GateScript0
 	dw Route6GateScript1
 
@@ -64,7 +64,7 @@ Route6GateScript_1e0a1:
 	ld [wOverrideSimulatedJoypadStatesMask], a
 	ret
 
-Route6GateTextPointers:
+Route6Gate_TextPointers:
 	dw Route6GateText1
 	dw Route6GateText2
 	dw Route6GateText3
diff --git a/scripts/route7.asm b/scripts/Route7.asm
index 5e8288ea..55774553 100755
--- a/scripts/route7.asm
+++ b/scripts/Route7.asm
@@ -1,7 +1,7 @@
-Route7Script:
+Route7_Script:
 	jp EnableAutoTextBoxDrawing
 
-Route7TextPointers:
+Route7_TextPointers:
 	dw Route7Text1
 
 Route7Text1:
diff --git a/scripts/route7gate.asm b/scripts/Route7Gate.asm
index 6d4e27bb..724172c5 100755
--- a/scripts/route7gate.asm
+++ b/scripts/Route7Gate.asm
@@ -1,11 +1,11 @@
-Route7GateScript:
+Route7Gate_Script:
 	call EnableAutoTextBoxDrawing
 	ld a, [wRoute7GateCurScript]
-	ld hl, Route7GateScriptPointers
+	ld hl, Route7Gate_ScriptPointers
 	call CallFunctionInTable
 	ret
 
-Route7GateScriptPointers:
+Route7Gate_ScriptPointers:
 	dw Route7GateScript0
 	dw Route7GateScript1
 
@@ -67,7 +67,7 @@ Route7GateScript1:
 	ld [wCurMapScript], a
 	ret
 
-Route7GateTextPointers:
+Route7Gate_TextPointers:
 	dw Route7GateText1
 	dw Route7GateText2
 	dw Route7GateText3
diff --git a/scripts/route8.asm b/scripts/Route8.asm
index e05508bb..f3388505 100755
--- a/scripts/route8.asm
+++ b/scripts/Route8.asm
@@ -1,18 +1,18 @@
-Route8Script:
+Route8_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route8TrainerHeader0
-	ld de, Route8ScriptPointers
+	ld de, Route8_ScriptPointers
 	ld a, [wRoute8CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute8CurScript], a
 	ret
 
-Route8ScriptPointers:
+Route8_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route8TextPointers:
+Route8_TextPointers:
 	dw Route8Text1
 	dw Route8Text2
 	dw Route8Text3
diff --git a/scripts/route8gate.asm b/scripts/Route8Gate.asm
index 28835f9d..8ecea68e 100755
--- a/scripts/route8gate.asm
+++ b/scripts/Route8Gate.asm
@@ -1,10 +1,10 @@
-Route8GateScript:
+Route8Gate_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route8GateScriptPointers
+	ld hl, Route8Gate_ScriptPointers
 	ld a, [wRoute8GateCurScript]
 	jp CallFunctionInTable
 
-Route8GateScriptPointers:
+Route8Gate_ScriptPointers:
 	dw Route8GateScript0
 	dw Route8GateScript1
 
@@ -64,7 +64,7 @@ Route8GateScript1:
 	ld [wRoute8GateCurScript], a
 	ret
 
-Route8GateTextPointers:
+Route8Gate_TextPointers:
 	dw Route8GateText1
 	dw Route8GateText2
 	dw Route8GateText3
diff --git a/scripts/route9.asm b/scripts/Route9.asm
index c965d853..a18096f0 100755
--- a/scripts/route9.asm
+++ b/scripts/Route9.asm
@@ -1,18 +1,18 @@
-Route9Script:
+Route9_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, Route9TrainerHeader0
-	ld de, Route9ScriptPointers
+	ld de, Route9_ScriptPointers
 	ld a, [wRoute9CurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wRoute9CurScript], a
 	ret
 
-Route9ScriptPointers:
+Route9_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route9TextPointers:
+Route9_TextPointers:
 	dw Route9Text1
 	dw Route9Text2
 	dw Route9Text3
diff --git a/scripts/ssanne1.asm b/scripts/SSAnne1F.asm
index 3f8861d5..5cace6ee 100755
--- a/scripts/ssanne1.asm
+++ b/scripts/SSAnne1F.asm
@@ -1,8 +1,8 @@
-SSAnne1Script:
+SSAnne1F_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SSAnne1TextPointers:
+SSAnne1F_TextPointers:
 	dw SSAnne1Text1
 	dw SSAnne1Text2
 
diff --git a/scripts/ssanne8.asm b/scripts/SSAnne1FRooms.asm
index c684f84b..2371f286 100755
--- a/scripts/ssanne8.asm
+++ b/scripts/SSAnne1FRooms.asm
@@ -1,18 +1,18 @@
-SSAnne8Script:
+SSAnne1FRooms_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, SSAnne8TrainerHeader0
-	ld de, SSAnne8ScriptPointers
-	ld a, [wSSAnne8CurScript]
+	ld de, SSAnne1FRooms_ScriptPointers
+	ld a, [wSSAnne1FRoomsCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSSAnne8CurScript], a
+	ld [wSSAnne1FRoomsCurScript], a
 	ret
 
-SSAnne8ScriptPointers:
+SSAnne1FRooms_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SSAnne8TextPointers:
+SSAnne1FRooms_TextPointers:
 	dw SSAnne8Text1
 	dw SSAnne8Text2
 	dw SSAnne8Text3
diff --git a/scripts/ssanne2.asm b/scripts/SSAnne2F.asm
index 654b881a..ba900748 100755
--- a/scripts/ssanne2.asm
+++ b/scripts/SSAnne2F.asm
@@ -1,16 +1,16 @@
-SSAnne2Script:
+SSAnne2F_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, SSAnne2ScriptPointers
-	ld a, [wSSAnne2CurScript]
+	ld hl, SSAnne2F_ScriptPointers
+	ld a, [wSSAnne2FCurScript]
 	jp CallFunctionInTable
 
 SSAnne2Script_613ab:
 	xor a
 	ld [wJoyIgnore], a
-	ld [wSSAnne2CurScript], a
+	ld [wSSAnne2FCurScript], a
 	ret
 
-SSAnne2ScriptPointers:
+SSAnne2F_ScriptPointers:
 	dw SSAnne2Script0
 	dw SSAnne2Script1
 	dw SSAnne2Script2
@@ -32,7 +32,7 @@ SSAnne2Script0:
 	call PlayMusic
 	ld a, [wCoordIndex]
 	ld [$ffdb], a
-	ld a, HS_SS_ANNE_2_RIVAL
+	ld a, HS_SS_ANNE_2F_RIVAL
 	ld [wMissableObjectIndex], a
 	predef ShowObject
 	call Delay3
@@ -53,7 +53,7 @@ SSAnne2Script0:
 .asm_61403
 	call MoveSprite
 	ld a, $1
-	ld [wSSAnne2CurScript], a
+	ld [wSSAnne2FCurScript], a
 	ret
 
 MovementData_6140c:
@@ -118,7 +118,7 @@ SSAnne2Script1:
 
 	call SSAnne2Script_61416
 	ld a, $2
-	ld [wSSAnne2CurScript], a
+	ld [wSSAnne2FCurScript], a
 	ret
 
 SSAnne2Script2:
@@ -150,7 +150,7 @@ SSAnne2Script2:
 	call PlaySound
 	callba Music_RivalAlternateStart
 	ld a, $3
-	ld [wSSAnne2CurScript], a
+	ld [wSSAnne2FCurScript], a
 	ret
 
 MovementData_614b7:
@@ -170,15 +170,15 @@ SSAnne2Script3:
 	ret nz
 	xor a
 	ld [wJoyIgnore], a
-	ld a, HS_SS_ANNE_2_RIVAL
+	ld a, HS_SS_ANNE_2F_RIVAL
 	ld [wMissableObjectIndex], a
 	predef HideObject
 	call PlayDefaultMusic
 	ld a, $4
-	ld [wSSAnne2CurScript], a
+	ld [wSSAnne2FCurScript], a
 	ret
 
-SSAnne2TextPointers:
+SSAnne2F_TextPointers:
 	dw SSAnne2Text1
 	dw SSAnne2Text2
 	dw SSAnne2Text3
diff --git a/scripts/ssanne9.asm b/scripts/SSAnne2FRooms.asm
index 1f965e0d..a79e1be8 100755
--- a/scripts/ssanne9.asm
+++ b/scripts/SSAnne2FRooms.asm
@@ -1,21 +1,21 @@
-SSAnne9Script:
+SSAnne2FRooms_Script:
 	ld a, $1
 	ld [wAutoTextBoxDrawingControl], a
 	xor a
 	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 	ld hl, SSAnne9TrainerHeader0
-	ld de, SSAnne9ScriptPointers
-	ld a, [wSSAnne9CurScript]
+	ld de, SSAnne2FRooms_ScriptPointers
+	ld a, [wSSAnne2FRoomsCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSSAnne9CurScript], a
+	ld [wSSAnne2FRoomsCurScript], a
 	ret
 
-SSAnne9ScriptPointers:
+SSAnne2FRooms_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SSAnne9TextPointers:
+SSAnne2FRooms_TextPointers:
 	dw SSAnne9Text1
 	dw SSAnne9Text2
 	dw SSAnne9Text3
diff --git a/scripts/ssanne3.asm b/scripts/SSAnne3F.asm
index e681591a..5da0e0c7 100755
--- a/scripts/ssanne3.asm
+++ b/scripts/SSAnne3F.asm
@@ -1,7 +1,7 @@
-SSAnne3Script:
+SSAnne3F_Script:
 	jp EnableAutoTextBoxDrawing
 
-SSAnne3TextPointers:
+SSAnne3F_TextPointers:
 	dw SSAnne3Text1
 
 SSAnne3Text1:
diff --git a/scripts/SSAnneB1F.asm b/scripts/SSAnneB1F.asm
new file mode 100755
index 00000000..25df076f
--- /dev/null
+++ b/scripts/SSAnneB1F.asm
@@ -0,0 +1,5 @@
+SSAnneB1F_Script:
+	jp EnableAutoTextBoxDrawing
+
+SSAnneB1F_TextPointers:
+	db "@"
diff --git a/scripts/ssanne10.asm b/scripts/SSAnneB1FRooms.asm
index 12433732..3777852c 100755
--- a/scripts/ssanne10.asm
+++ b/scripts/SSAnneB1FRooms.asm
@@ -1,18 +1,18 @@
-SSAnne10Script:
+SSAnneB1FRooms_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, SSAnne10TrainerHeader0
-	ld de, SSAnne10ScriptPointers
-	ld a, [wSSAnne10CurScript]
+	ld de, SSAnneB1FRooms_ScriptPointers
+	ld a, [wSSAnneB1FRoomsCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSSAnne10CurScript], a
+	ld [wSSAnneB1FRoomsCurScript], a
 	ret
 
-SSAnne10ScriptPointers:
+SSAnneB1FRooms_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SSAnne10TextPointers:
+SSAnneB1FRooms_TextPointers:
 	dw SSAnne10Text1
 	dw SSAnne10Text2
 	dw SSAnne10Text3
diff --git a/scripts/ssanne5.asm b/scripts/SSAnneBow.asm
index 0cfef9f4..4569f0f8 100755
--- a/scripts/ssanne5.asm
+++ b/scripts/SSAnneBow.asm
@@ -1,18 +1,18 @@
-SSAnne5Script:
+SSAnneBow_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, SSAnne5TrainerHeader0
-	ld de, SSAnne5ScriptPointers
-	ld a, [wSSAnne5CurScript]
+	ld de, SSAnneBow_ScriptPointers
+	ld a, [wSSAnneBowCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSSAnne5CurScript], a
+	ld [wSSAnneBowCurScript], a
 	ret
 
-SSAnne5ScriptPointers:
+SSAnneBow_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SSAnne5TextPointers:
+SSAnneBow_TextPointers:
 	dw SSAnne5Text1
 	dw SSAnne5Text2
 	dw SSAnne5Text3
diff --git a/scripts/ssanne7.asm b/scripts/SSAnneCaptainsRoom.asm
index 0df842c2..de0272e4 100755
--- a/scripts/ssanne7.asm
+++ b/scripts/SSAnneCaptainsRoom.asm
@@ -1,4 +1,4 @@
-SSAnne7Script:
+SSAnneCaptainsRoom_Script:
 	call SSAnne7Script_6189b
 	jp EnableAutoTextBoxDrawing
 
@@ -9,7 +9,7 @@ SSAnne7Script_6189b:
 	set 5, [hl]
 	ret
 
-SSAnne7TextPointers:
+SSAnneCaptainsRoom_TextPointers:
 	dw SSAnne7Text1
 	dw SSAnne7Text2
 	dw SSAnne7Text3
diff --git a/scripts/ssanne6.asm b/scripts/SSAnneKitchen.asm
index e1998858..137706a0 100755
--- a/scripts/ssanne6.asm
+++ b/scripts/SSAnneKitchen.asm
@@ -1,8 +1,8 @@
-SSAnne6Script:
+SSAnneKitchen_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SSAnne6TextPointers:
+SSAnneKitchen_TextPointers:
 	dw SSAnne6Text1
 	dw SSAnne6Text2
 	dw SSAnne6Text3
diff --git a/scripts/safarizonecenter.asm b/scripts/SafariZoneCenter.asm
index d796c403..0a266887 100755
--- a/scripts/safarizonecenter.asm
+++ b/scripts/SafariZoneCenter.asm
@@ -1,7 +1,7 @@
-SafariZoneCenterScript:
+SafariZoneCenter_Script:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneCenterTextPointers:
+SafariZoneCenter_TextPointers:
 	dw PickUpItemText
 	dw SafariZoneCenterText2
 	dw SafariZoneCenterText3
diff --git a/scripts/safarizoneresthouse1.asm b/scripts/SafariZoneCenterRestHouse.asm
index 1d43890d..a652644b 100755
--- a/scripts/safarizoneresthouse1.asm
+++ b/scripts/SafariZoneCenterRestHouse.asm
@@ -1,7 +1,7 @@
-SafariZoneRestHouse1Script:
+SafariZoneCenterRestHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneRestHouse1TextPointers:
+SafariZoneCenterRestHouse_TextPointers:
 	dw SafariZoneRestHouse1Text1
 	dw SafariZoneRestHouse1Text2
 
diff --git a/scripts/safarizoneeast.asm b/scripts/SafariZoneEast.asm
index 25d0ee30..7f4a5543 100755
--- a/scripts/safarizoneeast.asm
+++ b/scripts/SafariZoneEast.asm
@@ -1,7 +1,7 @@
-SafariZoneEastScript:
+SafariZoneEast_Script:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneEastTextPointers:
+SafariZoneEast_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
diff --git a/scripts/safarizoneresthouse3.asm b/scripts/SafariZoneEastRestHouse.asm
index 18c4770f..24141459 100755
--- a/scripts/safarizoneresthouse3.asm
+++ b/scripts/SafariZoneEastRestHouse.asm
@@ -1,8 +1,8 @@
-SafariZoneRestHouse3Script:
+SafariZoneEastRestHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SafariZoneRestHouse3TextPointers:
+SafariZoneEastRestHouse_TextPointers:
 	dw SafariZoneRestHouse3Text1
 	dw SafariZoneRestHouse3Text2
 	dw SafariZoneRestHouse3Text3
diff --git a/scripts/safarizoneentrance.asm b/scripts/SafariZoneGate.asm
index 5c6002a9..f3de556b 100755
--- a/scripts/safarizoneentrance.asm
+++ b/scripts/SafariZoneGate.asm
@@ -1,10 +1,10 @@
-SafariZoneEntranceScript:
+SafariZoneGate_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, SafariZoneEntranceScriptPointers
-	ld a, [wSafariZoneEntranceCurScript]
+	ld hl, SafariZoneGate_ScriptPointers
+	ld a, [wSafariZoneGateCurScript]
 	jp CallFunctionInTable
 
-SafariZoneEntranceScriptPointers:
+SafariZoneGate_ScriptPointers:
 	dw .SafariZoneEntranceScript0
 	dw .SafariZoneEntranceScript1
 	dw .SafariZoneEntranceScript2
@@ -30,7 +30,7 @@ SafariZoneEntranceScriptPointers:
 	cp $1
 	jr z, .asm_7520f
 	ld a, $2
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	ret
 .asm_7520f
 	ld a, D_RIGHT
@@ -39,7 +39,7 @@ SafariZoneEntranceScriptPointers:
 	ld a, $f0
 	ld [wJoyIgnore], a
 	ld a, $1
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	ret
 
 .CoordsData_75221:
@@ -68,7 +68,7 @@ SafariZoneEntranceScriptPointers:
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $5
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	ret
 
 .SafariZoneEntranceScript5
@@ -89,7 +89,7 @@ SafariZoneEntranceScriptPointers:
 	ld c, $3
 	call SafariZoneEntranceAutoWalk
 	ld a, $4
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	jr .asm_75286
 .asm_7527f
 	ld a, $5
@@ -104,7 +104,7 @@ SafariZoneEntranceScriptPointers:
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	ret
 
 .SafariZoneEntranceScript6
@@ -112,7 +112,7 @@ SafariZoneEntranceScriptPointers:
 	ret nz
 	call Delay3
 	ld a, [wcf0d]
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	ret
 
 SafariZoneEntranceAutoWalk:
@@ -130,7 +130,7 @@ SafariZoneEntranceScript_752b4:
 	and a
 	ret
 
-SafariZoneEntranceTextPointers:
+SafariZoneGate_TextPointers:
 	dw .SafariZoneEntranceText1
 	dw .SafariZoneEntranceText2
 	dw .SafariZoneEntranceText1
@@ -192,7 +192,7 @@ SafariZoneEntranceTextPointers:
 	SetEvent EVENT_IN_SAFARI_ZONE
 	ResetEventReuseHL EVENT_SAFARI_GAME_OVER
 	ld a, 3
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	jr .done
 
 .PleaseComeAgain
@@ -203,7 +203,7 @@ SafariZoneEntranceTextPointers:
 	ld c, 1
 	call SafariZoneEntranceAutoWalk
 	ld a, 4
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 .done
 	jp TextScriptEnd
 
@@ -251,7 +251,7 @@ SafariZoneEntranceTextPointers:
 	ld [wcf0d], a
 .asm_753b3
 	ld a, $6
-	ld [wSafariZoneEntranceCurScript], a
+	ld [wSafariZoneGateCurScript], a
 	jp TextScriptEnd
 
 .SafariZoneEntranceText_753bb
diff --git a/scripts/safarizonenorth.asm b/scripts/SafariZoneNorth.asm
index b870c99e..734328b4 100755
--- a/scripts/safarizonenorth.asm
+++ b/scripts/SafariZoneNorth.asm
@@ -1,7 +1,7 @@
-SafariZoneNorthScript:
+SafariZoneNorth_Script:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneNorthTextPointers:
+SafariZoneNorth_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw SafariZoneNorthText3
diff --git a/scripts/safarizoneresthouse4.asm b/scripts/SafariZoneNorthRestHouse.asm
index 3ff3fa48..fdc438f4 100755
--- a/scripts/safarizoneresthouse4.asm
+++ b/scripts/SafariZoneNorthRestHouse.asm
@@ -1,8 +1,8 @@
-SafariZoneRestHouse4Script:
+SafariZoneNorthRestHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SafariZoneRestHouse4TextPointers:
+SafariZoneNorthRestHouse_TextPointers:
 	dw SafariZoneRestHouse4Text1
 	dw SafariZoneRestHouse4Text2
 	dw SafariZoneRestHouse4Text3
diff --git a/scripts/safarizonesecrethouse.asm b/scripts/SafariZoneSecretHouse.asm
index 44c89281..2d9b2305 100755
--- a/scripts/safarizonesecrethouse.asm
+++ b/scripts/SafariZoneSecretHouse.asm
@@ -1,7 +1,7 @@
-SafariZoneSecretHouseScript:
+SafariZoneSecretHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneSecretHouseTextPointers:
+SafariZoneSecretHouse_TextPointers:
 	dw SafariZoneSecretHouseText1
 
 SafariZoneSecretHouseText1:
diff --git a/scripts/safarizonewest.asm b/scripts/SafariZoneWest.asm
index 81190c4c..483a92ee 100755
--- a/scripts/safarizonewest.asm
+++ b/scripts/SafariZoneWest.asm
@@ -1,7 +1,7 @@
-SafariZoneWestScript:
+SafariZoneWest_Script:
 	jp EnableAutoTextBoxDrawing
 
-SafariZoneWestTextPointers:
+SafariZoneWest_TextPointers:
 	dw PickUpItemText
 	dw PickUpItemText
 	dw PickUpItemText
diff --git a/scripts/safarizoneresthouse2.asm b/scripts/SafariZoneWestRestHouse.asm
index 4cd512f2..371bd56c 100755
--- a/scripts/safarizoneresthouse2.asm
+++ b/scripts/SafariZoneWestRestHouse.asm
@@ -1,8 +1,8 @@
-SafariZoneRestHouse2Script:
+SafariZoneWestRestHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-SafariZoneRestHouse2TextPointers:
+SafariZoneWestRestHouse_TextPointers:
 	dw SafariZoneRestHouse2Text1
 	dw SafariZoneRestHouse2Text2
 	dw SafariZoneRestHouse2Text3
diff --git a/scripts/saffroncity.asm b/scripts/SaffronCity.asm
index 57a1a3a5..02e6e2bb 100755
--- a/scripts/saffroncity.asm
+++ b/scripts/SaffronCity.asm
@@ -1,7 +1,7 @@
-SaffronCityScript:
+SaffronCity_Script:
 	jp EnableAutoTextBoxDrawing
 
-SaffronCityTextPointers:
+SaffronCity_TextPointers:
 	dw SaffronCityText1
 	dw SaffronCityText2
 	dw SaffronCityText3
diff --git a/scripts/saffrongym.asm b/scripts/SaffronGym.asm
index cbf935e7..e51763e5 100755
--- a/scripts/saffrongym.asm
+++ b/scripts/SaffronGym.asm
@@ -1,11 +1,11 @@
-SaffronGymScript:
+SaffronGym_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
 	call nz, .extra
 	call EnableAutoTextBoxDrawing
 	ld hl, SaffronGymTrainerHeader0
-	ld de, SaffronGymScriptPointers
+	ld de, SaffronGym_ScriptPointers
 	ld a, [wSaffronGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wSaffronGymCurScript], a
@@ -29,7 +29,7 @@ SaffronGymText_5d048:
 	ld [wCurMapScript], a
 	ret
 
-SaffronGymScriptPointers:
+SaffronGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -70,7 +70,7 @@ SaffronGymText_5d068:
 
 	jp SaffronGymText_5d048
 
-SaffronGymTextPointers:
+SaffronGym_TextPointers:
 	dw SaffronGymText1
 	dw SaffronGymText2
 	dw SaffronGymText3
diff --git a/scripts/saffronmart.asm b/scripts/SaffronMart.asm
index 8b140610..ebb3cddf 100755
--- a/scripts/saffronmart.asm
+++ b/scripts/SaffronMart.asm
@@ -1,7 +1,7 @@
-SaffronMartScript:
+SaffronMart_Script:
 	jp EnableAutoTextBoxDrawing
 
-SaffronMartTextPointers:
+SaffronMart_TextPointers:
 	dw SaffronCashierText
 	dw SaffronMartText2
 	dw SaffronMartText3
diff --git a/scripts/saffronhouse1.asm b/scripts/SaffronPidgeyHouse.asm
index 5f417978..f38fbfdb 100755
--- a/scripts/saffronhouse1.asm
+++ b/scripts/SaffronPidgeyHouse.asm
@@ -1,7 +1,7 @@
-SaffronHouse1Script:
+SaffronPidgeyHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-SaffronHouse1TextPointers:
+SaffronPidgeyHouse_TextPointers:
 	dw SaffronHouse1Text1
 	dw SaffronHouse1Text2
 	dw SaffronHouse1Text3
diff --git a/scripts/saffronpokecenter.asm b/scripts/SaffronPokecenter.asm
index 82467215..a1d73628 100755
--- a/scripts/saffronpokecenter.asm
+++ b/scripts/SaffronPokecenter.asm
@@ -1,8 +1,8 @@
-SaffronPokecenterScript:
+SaffronPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-SaffronPokecenterTextPointers:
+SaffronPokecenter_TextPointers:
 	dw SaffronHealNurseText
 	dw SaffronPokecenterText2
 	dw SaffronPokecenterText3
diff --git a/scripts/seafoamislands1.asm b/scripts/SeafoamIslands1F.asm
index 52561fa7..dc3b8599 100755
--- a/scripts/seafoamislands1.asm
+++ b/scripts/SeafoamIslands1F.asm
@@ -1,4 +1,4 @@
-SeafoamIslands1Script:
+SeafoamIslands1F_Script:
 	call EnableAutoTextBoxDrawing
 	SetEvent EVENT_IN_SEAFOAM_ISLANDS
 	ld hl, wFlags_0xcd60
@@ -13,16 +13,16 @@ SeafoamIslands1Script:
 	cp $1
 	jr nz, .asm_44819
 	SetEventReuseHL EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1
 	ld [wObjectToShow], a
 	jr .asm_44825
 .asm_44819
 	SetEventAfterBranchReuseHL EVENT_SEAFOAM1_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2
 	ld [wObjectToShow], a
 .asm_44825
 	ld a, [wObjectToHide]
@@ -42,6 +42,6 @@ Seafoam1HolesCoords:
 	db $06,$18
 	db $ff
 
-SeafoamIslands1TextPointers:
+SeafoamIslands1F_TextPointers:
 	dw BoulderText
 	dw BoulderText
diff --git a/scripts/seafoamislands2.asm b/scripts/SeafoamIslandsB1F.asm
index 50024bad..876c0837 100755
--- a/scripts/seafoamislands2.asm
+++ b/scripts/SeafoamIslandsB1F.asm
@@ -1,4 +1,4 @@
-SeafoamIslands2Script:
+SeafoamIslandsB1F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, wFlags_0xcd60
 	bit 7, [hl]
@@ -12,16 +12,16 @@ SeafoamIslands2Script:
 	cp $1
 	jr nz, .asm_46340
 	SetEventReuseHL EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1
 	ld [wObjectToShow], a
 	jr .asm_4634c
 .asm_46340
 	SetEventAfterBranchReuseHL EVENT_SEAFOAM2_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2
 	ld [wObjectToShow], a
 .asm_4634c
 	ld a, [wObjectToHide]
@@ -41,6 +41,6 @@ Seafoam2HolesCoords:
 	db $06,$17
 	db $ff
 
-SeafoamIslands2TextPointers:
+SeafoamIslandsB1F_TextPointers:
 	dw BoulderText
 	dw BoulderText
diff --git a/scripts/seafoamislands3.asm b/scripts/SeafoamIslandsB2F.asm
index 4a7848a4..c0141a3e 100755
--- a/scripts/seafoamislands3.asm
+++ b/scripts/SeafoamIslandsB2F.asm
@@ -1,4 +1,4 @@
-SeafoamIslands3Script:
+SeafoamIslandsB2F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, wFlags_0xcd60
 	bit 7, [hl]
@@ -12,16 +12,16 @@ SeafoamIslands3Script:
 	cp $1
 	jr nz, .asm_4647c
 	SetEventReuseHL EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_3
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_3
 	ld [wObjectToShow], a
 	jr .asm_46488
 .asm_4647c
 	SetEventAfterBranchReuseHL EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_4
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_4
 	ld [wObjectToShow], a
 .asm_46488
 	ld a, [wObjectToHide]
@@ -41,6 +41,6 @@ Seafoam3HolesCoords:
 	db $06,$16
 	db $ff
 
-SeafoamIslands3TextPointers:
+SeafoamIslandsB2F_TextPointers:
 	dw BoulderText
 	dw BoulderText
diff --git a/scripts/seafoamislands4.asm b/scripts/SeafoamIslandsB3F.asm
index 34873004..7343b17d 100755
--- a/scripts/seafoamislands4.asm
+++ b/scripts/SeafoamIslandsB3F.asm
@@ -1,4 +1,4 @@
-SeafoamIslands4Script:
+SeafoamIslandsB3F_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, wFlags_0xcd60
 	bit 7, [hl]
@@ -12,16 +12,16 @@ SeafoamIslands4Script:
 	cp $1
 	jr nz, .asm_465b8
 	SetEventReuseHL EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1
+	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1
 	ld [wObjectToShow], a
 	jr .asm_465c4
 .asm_465b8
 	SetEventAfterBranchReuseHL EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE
-	ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2
 	ld [wObjectToHide], a
-	ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2
+	ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2
 	ld [wObjectToShow], a
 .asm_465c4
 	ld a, [wObjectToHide]
@@ -40,8 +40,8 @@ SeafoamIslands4Script:
 	bit 4, a
 	ret nz
 .asm_465ed
-	ld hl, SeafoamIslands4ScriptPointers
-	ld a, [wSeafoamIslands4CurScript]
+	ld hl, SeafoamIslandsB3F_ScriptPointers
+	ld a, [wSeafoamIslandsB3FCurScript]
 	jp CallFunctionInTable
 
 Seafoam4HolesCoords:
@@ -49,7 +49,7 @@ Seafoam4HolesCoords:
 	db $10,$06
 	db $ff
 
-SeafoamIslands4ScriptPointers:
+SeafoamIslandsB3F_ScriptPointers:
 	dw SeafoamIslands4Script0
 	dw SeafoamIslands4Script1
 	dw SeafoamIslands4Script2
@@ -73,7 +73,7 @@ SeafoamIslands4Script0:
 	ld hl, wFlags_D733
 	set 2, [hl]
 	ld a, $1
-	ld [wSeafoamIslands4CurScript], a
+	ld [wSeafoamIslandsB3FCurScript], a
 	ret
 
 RLEMovement46632:
@@ -87,7 +87,7 @@ SeafoamIslands4Script1:
 	and a
 	ret nz
 	ld a, $0
-	ld [wSeafoamIslands4CurScript], a
+	ld [wSeafoamIslandsB3FCurScript], a
 	ret
 
 SeafoamIslands4Script2:
@@ -116,7 +116,7 @@ SeafoamIslands4Script2:
 	set 2, [hl]
 	ld a, $3
 .asm_4667b
-	ld [wSeafoamIslands4CurScript], a
+	ld [wSeafoamIslandsB3FCurScript], a
 	ret
 
 RLEData_4667f:
@@ -137,10 +137,10 @@ SeafoamIslands4Script3:
 	and a
 	ret nz
 	ld a, $0
-	ld [wSeafoamIslands4CurScript], a
+	ld [wSeafoamIslandsB3FCurScript], a
 	ret
 
-SeafoamIslands4TextPointers:
+SeafoamIslandsB3F_TextPointers:
 	dw BoulderText
 	dw BoulderText
 	dw BoulderText
diff --git a/scripts/seafoamislands5.asm b/scripts/SeafoamIslandsB4F.asm
index a233fb6a..d08628d0 100755
--- a/scripts/seafoamislands5.asm
+++ b/scripts/SeafoamIslandsB4F.asm
@@ -1,16 +1,16 @@
-SeafoamIslands5Script:
+SeafoamIslandsB4F_Script:
 	call EnableAutoTextBoxDrawing
-	ld a, [wSeafoamIslands5CurScript]
-	ld hl, SeafoamIslands5ScriptPointers
+	ld a, [wSeafoamIslandsB4FCurScript]
+	ld hl, SeafoamIslandsB4F_ScriptPointers
 	jp CallFunctionInTable
 
 SeafoamIslands5Script_467a5:
 	xor a
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	ld [wJoyIgnore], a
 	ret
 
-SeafoamIslands5ScriptPointers:
+SeafoamIslandsB4F_ScriptPointers:
 	dw SeafoamIslands5Script0
 	dw SeafoamIslands5Script1
 	dw SeafoamIslands5Script2
@@ -23,7 +23,7 @@ SeafoamIslands5Script4:
 	jr z, SeafoamIslands5Script_467a5
 	call EndTrainerBattle
 	ld a, $0
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	ret
 
 SeafoamIslands5Script0:
@@ -49,7 +49,7 @@ SeafoamIslands5Script0:
 	ld hl, wFlags_D733
 	res 2, [hl]
 	ld a, $1
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	ret
 
 .Coords
@@ -66,7 +66,7 @@ SeafoamIslands5Script1:
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	ret
 
 SeafoamIslands5Script2:
@@ -92,7 +92,7 @@ SeafoamIslands5Script2:
 	call StartSimulatingJoypadStates
 	ld a, $3
 .asm_46849
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	ret
 
 .Coords
@@ -121,7 +121,7 @@ SeafoamIslands5Script3:
 	and a
 	ret nz
 	ld a, $0
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	ret
 
 SeaFoamIslands5Script_46872:
@@ -130,7 +130,7 @@ SeaFoamIslands5Script_46872:
 	ld [wWalkBikeSurfStateCopy], a
 	jp ForceBikeOrSurf
 
-SeafoamIslands5TextPointers:
+SeafoamIslandsB4F_TextPointers:
 	dw BoulderText
 	dw BoulderText
 	dw ArticunoText
@@ -153,7 +153,7 @@ ArticunoText:
 	ld hl, ArticunoTrainerHeader
 	call TalkToTrainer
 	ld a, $4
-	ld [wSeafoamIslands5CurScript], a
+	ld [wSeafoamIslandsB4FCurScript], a
 	jp TextScriptEnd
 
 ArticunoBattleText:
diff --git a/scripts/silphco10.asm b/scripts/SilphCo10F.asm
index 5cfb92b2..40506682 100755
--- a/scripts/silphco10.asm
+++ b/scripts/SilphCo10F.asm
@@ -1,11 +1,11 @@
-SilphCo10Script:
+SilphCo10F_Script:
 	call SilphCo10Script_5a14f
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo10TrainerHeader0
-	ld de, SilphCo10ScriptPointers
-	ld a, [wSilphCo10CurScript]
+	ld de, SilphCo10F_ScriptPointers
+	ld a, [wSilphCo10FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo10CurScript], a
+	ld [wSilphCo10FCurScript], a
 	ret
 
 SilphCo10Script_5a14f:
@@ -34,12 +34,12 @@ SilphCo10Text_5a176:
 	SetEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR
 	ret
 
-SilphCo10ScriptPointers:
+SilphCo10F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo10TextPointers:
+SilphCo10F_TextPointers:
 	dw SilphCo10Text1
 	dw SilphCo10Text2
 	dw SilphCo10Text3
diff --git a/scripts/silphco11.asm b/scripts/SilphCo11F.asm
index 342fef07..483082a1 100755
--- a/scripts/silphco11.asm
+++ b/scripts/SilphCo11F.asm
@@ -1,11 +1,11 @@
-SilphCo11Script:
+SilphCo11F_Script:
 	call SilphCo11Script_62110
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo11TrainerHeader0
-	ld de, SilphCo11ScriptPointers
-	ld a, [wSilphCo11CurScript]
+	ld de, SilphCo11F_ScriptPointers
+	ld a, [wSilphCo11FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo11CurScript], a
+	ld [wSilphCo11FCurScript], a
 	ret
 
 SilphCo11Script_62110:
@@ -150,11 +150,11 @@ SilphCo11Script_621c4:
 	ld [wJoyIgnore], a
 
 SilphCo11Script_621c8:
-	ld [wSilphCo11CurScript], a
+	ld [wSilphCo11FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-SilphCo11ScriptPointers:
+SilphCo11F_ScriptPointers:
 	dw SilphCo11Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -272,7 +272,7 @@ SilphCo11Script4:
 	ld a, $5
 	jp SilphCo11Script_621c8
 
-SilphCo11TextPointers:
+SilphCo11F_TextPointers:
 	dw SilphCo11Text1
 	dw SilphCo11Text2
 	dw SilphCo11Text3
diff --git a/scripts/silphco1.asm b/scripts/SilphCo1F.asm
index c0cb169b..6ccaa29c 100755
--- a/scripts/silphco1.asm
+++ b/scripts/SilphCo1F.asm
@@ -1,4 +1,4 @@
-SilphCo1Script:
+SilphCo1F_Script:
 	call EnableAutoTextBoxDrawing
 	CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI
 	ret z
@@ -8,7 +8,7 @@ SilphCo1Script:
 	ld [wMissableObjectIndex], a
 	predef_jump ShowObject
 
-SilphCo1TextPointers:
+SilphCo1F_TextPointers:
 	dw SilphCo1Text1
 
 SilphCo1Text1:
diff --git a/scripts/silphco2.asm b/scripts/SilphCo2F.asm
index e77c45dd..5fd542cb 100755
--- a/scripts/silphco2.asm
+++ b/scripts/SilphCo2F.asm
@@ -1,11 +1,11 @@
-SilphCo2Script:
+SilphCo2F_Script:
 	call SilphCo2Script_59d07
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo2TrainerHeader0
-	ld de, SilphCo2ScriptPointers
-	ld a, [wSilphCo2CurScript]
+	ld de, SilphCo2F_ScriptPointers
+	ld a, [wSilphCo2FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo2CurScript], a
+	ld [wSilphCo2FCurScript], a
 	ret
 
 SilphCo2Script_59d07:
@@ -86,12 +86,12 @@ SilphCo2Script_59d6f:
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1
 	ret
 
-SilphCo2ScriptPointers:
+SilphCo2F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo2TextPointers:
+SilphCo2F_TextPointers:
 	dw SilphCo2Text1
 	dw SilphCo2Text2
 	dw SilphCo2Text3
diff --git a/scripts/silphco3.asm b/scripts/SilphCo3F.asm
index 0d12b768..42b5d611 100755
--- a/scripts/silphco3.asm
+++ b/scripts/SilphCo3F.asm
@@ -1,11 +1,11 @@
-SilphCo3Script:
+SilphCo3F_Script:
 	call SilphCo3Script_59f71
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo3TrainerHeader0
-	ld de, SilphCo3ScriptPointers
-	ld a, [wSilphCo3CurScript]
+	ld de, SilphCo3F_ScriptPointers
+	ld a, [wSilphCo3FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo3CurScript], a
+	ld [wSilphCo3FCurScript], a
 	ret
 
 SilphCo3Script_59f71:
@@ -50,12 +50,12 @@ SilphCo3Script_59fad:
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1
 	ret
 
-SilphCo3ScriptPointers:
+SilphCo3F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo3TextPointers:
+SilphCo3F_TextPointers:
 	dw SilphCo3Text1
 	dw SilphCo3Text2
 	dw SilphCo3Text3
diff --git a/scripts/silphco4.asm b/scripts/SilphCo4F.asm
index 1cfd1ceb..7d5072f6 100755
--- a/scripts/silphco4.asm
+++ b/scripts/SilphCo4F.asm
@@ -1,11 +1,11 @@
-SilphCo4Script:
+SilphCo4F_Script:
 	call SilphCo4Script_19d21
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo4TrainerHeader0
-	ld de, SilphCo4ScriptPointers
-	ld a, [wSilphCo4CurScript]
+	ld de, SilphCo4F_ScriptPointers
+	ld a, [wSilphCo4FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo4CurScript], a
+	ld [wSilphCo4FCurScript], a
 	ret
 
 SilphCo4Script_19d21:
@@ -86,12 +86,12 @@ SilphCo4Script_19d89:
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1
 	ret
 
-SilphCo4ScriptPointers:
+SilphCo4F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo4TextPointers:
+SilphCo4F_TextPointers:
 	dw SilphCo4Text1
 	dw SilphCo4Text2
 	dw SilphCo4Text3
diff --git a/scripts/silphco5.asm b/scripts/SilphCo5F.asm
index 45a81b68..d9deda5b 100755
--- a/scripts/silphco5.asm
+++ b/scripts/SilphCo5F.asm
@@ -1,11 +1,11 @@
-SilphCo5Script:
+SilphCo5F_Script:
 	call SilphCo5Script_19f4d
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo5TrainerHeader0
-	ld de, SilphCo5ScriptPointers
-	ld a, [wSilphCo5CurScript]
+	ld de, SilphCo5F_ScriptPointers
+	ld a, [wSilphCo5FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo5CurScript], a
+	ld [wSilphCo5FCurScript], a
 	ret
 
 SilphCo5Script_19f4d:
@@ -65,12 +65,12 @@ SilphCo5Script_19f9e:
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR1
 	ret
 
-SilphCo5ScriptPointers:
+SilphCo5F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo5TextPointers:
+SilphCo5F_TextPointers:
 	dw SilphCo5Text1
 	dw SilphCo5Text2
 	dw SilphCo5Text3
diff --git a/scripts/silphco6.asm b/scripts/SilphCo6F.asm
index 240b6793..ddbcba79 100755
--- a/scripts/silphco6.asm
+++ b/scripts/SilphCo6F.asm
@@ -1,11 +1,11 @@
-SilphCo6Script:
+SilphCo6F_Script:
 	call SilphCo6Script_1a1bf
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo6TrainerHeader0
-	ld de, SilphCo6ScriptPointers
-	ld a, [wSilphCo6CurScript]
+	ld de, SilphCo6F_ScriptPointers
+	ld a, [wSilphCo6FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo6CurScript], a
+	ld [wSilphCo6FCurScript], a
 	ret
 
 SilphCo6Script_1a1bf:
@@ -34,12 +34,12 @@ SilphCo6Script_1a1e6:
 	SetEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR
 	ret
 
-SilphCo6ScriptPointers:
+SilphCo6F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo6TextPointers:
+SilphCo6F_TextPointers:
 	dw SilphCo6Text1
 	dw SilphCo6Text2
 	dw SilphCo6Text3
diff --git a/scripts/silphco7.asm b/scripts/SilphCo7F.asm
index b211c8a9..e7594663 100755
--- a/scripts/silphco7.asm
+++ b/scripts/SilphCo7F.asm
@@ -1,11 +1,11 @@
-SilphCo7Script:
+SilphCo7F_Script:
 	call SilphCo7Script_51b77
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo7TrainerHeader0
-	ld de, SilphCo7ScriptPointers
-	ld a, [wSilphCo7CurScript]
+	ld de, SilphCo7F_ScriptPointers
+	ld a, [wSilphCo7FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo7CurScript], a
+	ld [wSilphCo7FCurScript], a
 	ret
 
 SilphCo7Script_51b77:
@@ -106,11 +106,11 @@ SilphCo7Text_51c0c:
 	ld [wJoyIgnore], a
 
 SilphCo7Text_51c10:
-	ld [wSilphCo7CurScript], a
+	ld [wSilphCo7FCurScript], a
 	ld [wCurMapScript], a
 	ret
 
-SilphCo7ScriptPointers:
+SilphCo7F_ScriptPointers:
 	dw SilphCo7Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -262,7 +262,7 @@ SilphCo7Script5:
 	ld [wJoyIgnore], a
 	jp SilphCo7Text_51c10
 
-SilphCo7TextPointers:
+SilphCo7F_TextPointers:
 	dw SilphCo7Text1
 	dw SilphCo7Text2
 	dw SilphCo7Text3
diff --git a/scripts/silphco8.asm b/scripts/SilphCo8F.asm
index 498fd569..ce6579f7 100755
--- a/scripts/silphco8.asm
+++ b/scripts/SilphCo8F.asm
@@ -1,11 +1,11 @@
-SilphCo8Script:
+SilphCo8F_Script:
 	call SilphCo8Script_5651a
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo8TrainerHeader0
-	ld de, SilphCo8ScriptPointers
-	ld a, [wSilphCo8CurScript]
+	ld de, SilphCo8F_ScriptPointers
+	ld a, [wSilphCo8FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo8CurScript], a
+	ld [wSilphCo8FCurScript], a
 	ret
 
 SilphCo8Script_5651a:
@@ -70,12 +70,12 @@ SilphCo8Script_5656d:
 	SetEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR
 	ret
 
-SilphCo8ScriptPointers:
+SilphCo8F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo8TextPointers:
+SilphCo8F_TextPointers:
 	dw SilphCo8Text1
 	dw SilphCo8Text2
 	dw SilphCo8Text3
diff --git a/scripts/silphco9.asm b/scripts/SilphCo9F.asm
index 57b8bc89..66291e98 100755
--- a/scripts/silphco9.asm
+++ b/scripts/SilphCo9F.asm
@@ -1,11 +1,11 @@
-SilphCo9Script:
+SilphCo9F_Script:
 	call SilphCo9Script_5d7d1
 	call EnableAutoTextBoxDrawing
 	ld hl, SilphCo9TrainerHeader0
-	ld de, SilphCo9ScriptPointers
-	ld a, [wSilphCo9CurScript]
+	ld de, SilphCo9F_ScriptPointers
+	ld a, [wSilphCo9FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wSilphCo9CurScript], a
+	ld [wSilphCo9FCurScript], a
 	ret
 
 SilphCo9Script_5d7d1:
@@ -118,12 +118,12 @@ SilphCo9Script_5d863:
 	SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR1
 	ret
 
-SilphCo9ScriptPointers:
+SilphCo9F_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-SilphCo9TextPointers:
+SilphCo9F_TextPointers:
 	dw SilphCo9Text1
 	dw SilphCo9Text2
 	dw SilphCo9Text3
diff --git a/scripts/silphcoelevator.asm b/scripts/SilphCoElevator.asm
index df4d08c7..49de6b27 100755
--- a/scripts/silphcoelevator.asm
+++ b/scripts/SilphCoElevator.asm
@@ -1,4 +1,4 @@
-SilphCoElevatorScript:
+SilphCoElevator_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -32,7 +32,7 @@ SilphCoElevatorScript_457ea:
 	ret
 
 SilphCoElevatorScript_457f1:
-	ld hl, SilphCoElavatorFloors
+	ld hl, SilphCoElevatorFloors
 	call LoadItemList
 	ld hl, SilphCoElevatorWarpMaps
 	ld de, wElevatorWarpMaps
@@ -40,7 +40,7 @@ SilphCoElevatorScript_457f1:
 	call CopyData
 	ret
 
-SilphCoElavatorFloors:
+SilphCoElevatorFloors:
 	db $0B ; num elements in list
 	db FLOOR_1F
 	db FLOOR_2F
@@ -77,7 +77,7 @@ SilphCoElevatorScript_45827:
 	callba ShakeElevator
 	ret
 
-SilphCoElevatorTextPointers:
+SilphCoElevator_TextPointers:
 	dw SilphCoElevatorText1
 
 SilphCoElevatorText1:
diff --git a/scripts/tradecenter.asm b/scripts/TradeCenter.asm
index 80efe4f9..ddb3061e 100755
--- a/scripts/tradecenter.asm
+++ b/scripts/TradeCenter.asm
@@ -1,4 +1,4 @@
-TradeCenterScript:
+TradeCenter_Script:
 	call EnableAutoTextBoxDrawing
 	ld a, [hSerialConnectionStatus]
 	cp USING_INTERNAL_CLOCK
@@ -30,7 +30,7 @@ TradeCenterScript:
 	ld [wSpriteStateData1 + $19], a
 	ret
 
-TradeCenterTextPointers:
+TradeCenter_TextPointers:
 	dw TradeCenterText1
 
 TradeCenterText1:
diff --git a/scripts/UndergroundPathNorthSouth.asm b/scripts/UndergroundPathNorthSouth.asm
new file mode 100755
index 00000000..52b3d8bf
--- /dev/null
+++ b/scripts/UndergroundPathNorthSouth.asm
@@ -0,0 +1,5 @@
+UndergroundPathNorthSouth_Script:
+	jp EnableAutoTextBoxDrawing
+
+UndergroundPathNorthSouth_TextPointers:
+	db "@"
diff --git a/scripts/undergroundpathentranceroute5.asm b/scripts/UndergroundPathRoute5.asm
index 18707c4a..23d72569 100755
--- a/scripts/undergroundpathentranceroute5.asm
+++ b/scripts/UndergroundPathRoute5.asm
@@ -1,4 +1,4 @@
-UndergroundPathEntranceRoute5Script:
+UndergroundPathRoute5_Script:
 	ld a, ROUTE_5
 	ld [wLastMap], a
 	ret
@@ -6,7 +6,7 @@ UndergroundPathEntranceRoute5Script:
 UndergroundPathEntranceRoute5_5d6af:
 	db "@"
 
-UndergroundPathEntranceRoute5TextPointers:
+UndergroundPathRoute5_TextPointers:
 	dw UndergroundPathEntranceRoute5Text1
 
 UndergroundPathEntranceRoute5Text1:
diff --git a/scripts/undergroundpathentranceroute6.asm b/scripts/UndergroundPathRoute6.asm
index c6dfdcc9..0a690518 100755
--- a/scripts/undergroundpathentranceroute6.asm
+++ b/scripts/UndergroundPathRoute6.asm
@@ -1,9 +1,9 @@
-UndergroundPathEntranceRoute6Script:
+UndergroundPathRoute6_Script:
 	ld a, ROUTE_6
 	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
-UndergroundPathEntranceRoute6TextPointers:
+UndergroundPathRoute6_TextPointers:
 	dw UndergroundPathEntranceRoute6Text1
 
 UndergroundPathEntranceRoute6Text1:
diff --git a/scripts/undergroundpathentranceroute7.asm b/scripts/UndergroundPathRoute7.asm
index 84c8e4d5..3a1f14c7 100755
--- a/scripts/undergroundpathentranceroute7.asm
+++ b/scripts/UndergroundPathRoute7.asm
@@ -1,9 +1,9 @@
-UndergroundPathEntranceRoute7Script:
+UndergroundPathRoute7_Script:
 	ld a, ROUTE_7
 	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
-UndergroundPathEntranceRoute7TextPointers:
+UndergroundPathRoute7_TextPointers:
 	dw UndergroundPathEntranceRoute7Text1
 
 UndergroundPathEntranceRoute7Text1:
diff --git a/scripts/undergroundpathentranceroute7copy.asm b/scripts/UndergroundPathRoute7Copy.asm
index c623eeec..8a494caf 100755
--- a/scripts/undergroundpathentranceroute7copy.asm
+++ b/scripts/UndergroundPathRoute7Copy.asm
@@ -1,9 +1,9 @@
-UndergroundPathEntranceRoute7CopyScript:
+UndergroundPathRoute7Copy_Script:
 	ld a, ROUTE_7
 	ld [wLastMap], a
 	ret
 
-UndergroundPathEntranceRoute7CopyTextPointers:
+UndergroundPathRoute7Copy_TextPointers:
 	dw UGPathRoute7EntranceUnusedText_5d773
 	dw UGPathRoute7EntranceUnusedText_5d77d
 
diff --git a/scripts/undergroundpathentranceroute8.asm b/scripts/UndergroundPathRoute8.asm
index ad0b60ab..ab0a9977 100755
--- a/scripts/undergroundpathentranceroute8.asm
+++ b/scripts/UndergroundPathRoute8.asm
@@ -1,9 +1,9 @@
-UndergroundPathEntranceRoute8Script:
+UndergroundPathRoute8_Script:
 	ld a, ROUTE_8
 	ld [wLastMap], a
 	jp EnableAutoTextBoxDrawing
 
-UndergroundPathEntranceRoute8TextPointers:
+UndergroundPathRoute8_TextPointers:
 	dw UndergroundPathEntranceRoute8Text1
 
 UndergroundPathEntranceRoute8Text1:
diff --git a/scripts/UndergroundPathWestEast.asm b/scripts/UndergroundPathWestEast.asm
new file mode 100755
index 00000000..cb1a7bd8
--- /dev/null
+++ b/scripts/UndergroundPathWestEast.asm
@@ -0,0 +1,5 @@
+UndergroundPathWestEast_Script:
+	jp EnableAutoTextBoxDrawing
+
+UndergroundPathWestEast_TextPointers:
+	db "@"
diff --git a/scripts/vermilioncity.asm b/scripts/VermilionCity.asm
index 0a734e25..1ac81521 100755
--- a/scripts/vermilioncity.asm
+++ b/scripts/VermilionCity.asm
@@ -1,4 +1,4 @@
-VermilionCityScript:
+VermilionCity_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
@@ -9,7 +9,7 @@ VermilionCityScript:
 	bit 5, [hl]
 	res 5, [hl]
 	call nz, VermilionCityScript_197c0
-	ld hl, VermilionCityScriptPointers
+	ld hl, VermilionCity_ScriptPointers
 	ld a, [wVermilionCityCurScript]
 	jp CallFunctionInTable
 
@@ -30,7 +30,7 @@ VermilionCityScript_197cb:
 	ld [wVermilionCityCurScript], a
 	ret
 
-VermilionCityScriptPointers:
+VermilionCity_ScriptPointers:
 	dw VermilionCityScript0
 	dw VermilionCityScript1
 	dw VermilionCityScript2
@@ -113,7 +113,7 @@ VermilionCityScript1:
 	ld [wVermilionCityCurScript], a
 	ret
 
-VermilionCityTextPointers:
+VermilionCity_TextPointers:
 	dw VermilionCityText1
 	dw VermilionCityText2
 	dw VermilionCityText3
diff --git a/scripts/vermiliondock.asm b/scripts/VermilionDock.asm
index 5b5d520b..65b66c52 100755
--- a/scripts/vermiliondock.asm
+++ b/scripts/VermilionDock.asm
@@ -1,4 +1,4 @@
-VermilionDockScript:
+VermilionDock_Script:
 	call EnableAutoTextBoxDrawing
 	CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK
 	jr nz, .asm_1db8d
@@ -207,7 +207,7 @@ VermilionDock_EraseSSAnne:
 	call DelayFrames
 	ret
 
-VermilionDockTextPointers:
+VermilionDock_TextPointers:
 	dw VermilionDockText1
 
 VermilionDockText1:
diff --git a/scripts/vermiliongym.asm b/scripts/VermilionGym.asm
index c22ce9ce..5755628c 100755
--- a/scripts/vermiliongym.asm
+++ b/scripts/VermilionGym.asm
@@ -1,4 +1,4 @@
-VermilionGymScript:
+VermilionGym_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
@@ -10,7 +10,7 @@ VermilionGymScript:
 	call nz, VermilionGymScript_5ca6d
 	call EnableAutoTextBoxDrawing
 	ld hl, VermilionGymTrainerHeader0
-	ld de, VermilionGymScriptPointers
+	ld de, VermilionGym_ScriptPointers
 	ld a, [wVermilionGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wVermilionGymCurScript], a
@@ -48,7 +48,7 @@ VermilionGymScript_5ca8a:
 	ld [wCurMapScript], a
 	ret
 
-VermilionGymScriptPointers:
+VermilionGym_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -89,7 +89,7 @@ VermilionGymScript_5caaa:
 
 	jp VermilionGymScript_5ca8a
 
-VermilionGymTextPointers:
+VermilionGym_TextPointers:
 	dw VermilionGymText1
 	dw VermilionGymText2
 	dw VermilionGymText3
diff --git a/scripts/vermilionmart.asm b/scripts/VermilionMart.asm
index 2d4df78d..00ba0c26 100755
--- a/scripts/vermilionmart.asm
+++ b/scripts/VermilionMart.asm
@@ -1,7 +1,7 @@
-VermilionMartScript:
+VermilionMart_Script:
 	jp EnableAutoTextBoxDrawing
 
-VermilionMartTextPointers:
+VermilionMart_TextPointers:
 	dw VermilionCashierText
 	dw VermilionMartText2
 	dw VermilionMartText3
diff --git a/scripts/vermilionhouse2.asm b/scripts/VermilionOldRodHouse.asm
index c0735f32..772158ff 100755
--- a/scripts/vermilionhouse2.asm
+++ b/scripts/VermilionOldRodHouse.asm
@@ -1,7 +1,7 @@
-VermilionHouse2Script:
+VermilionOldRodHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-VermilionHouse2TextPointers:
+VermilionOldRodHouse_TextPointers:
 	dw VermilionHouse2Text1
 
 VermilionHouse2Text1:
diff --git a/scripts/vermilionhouse1.asm b/scripts/VermilionPidgeyHouse.asm
index d2dac4ca..5004d367 100755
--- a/scripts/vermilionhouse1.asm
+++ b/scripts/VermilionPidgeyHouse.asm
@@ -1,8 +1,8 @@
-VermilionHouse1Script:
+VermilionPidgeyHouse_Script:
 	call EnableAutoTextBoxDrawing
 	ret
 
-VermilionHouse1TextPointers:
+VermilionPidgeyHouse_TextPointers:
 	dw VermilionHouse1Text1
 	dw VermilionHouse1Text2
 	dw VermilionHouse1Text3
diff --git a/scripts/vermilionpokecenter.asm b/scripts/VermilionPokecenter.asm
index f70aed31..60b28c57 100755
--- a/scripts/vermilionpokecenter.asm
+++ b/scripts/VermilionPokecenter.asm
@@ -1,8 +1,8 @@
-VermilionPokecenterScript:
+VermilionPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-VermilionPokecenterTextPointers:
+VermilionPokecenter_TextPointers:
 	dw VermilionHealNurseText
 	dw VermilionPokecenterText2
 	dw VermilionPokecenterText3
diff --git a/scripts/vermilionhouse3.asm b/scripts/VermilionTradeHouse.asm
index 1f0af501..828e3716 100755
--- a/scripts/vermilionhouse3.asm
+++ b/scripts/VermilionTradeHouse.asm
@@ -1,7 +1,7 @@
-VermilionHouse3Script:
+VermilionTradeHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-VermilionHouse3TextPointers:
+VermilionTradeHouse_TextPointers:
 	dw VermilionHouse3Text1
 
 VermilionHouse3Text1:
diff --git a/scripts/victoryroad1.asm b/scripts/VictoryRoad1F.asm
index 5409d733..0a2588a7 100755
--- a/scripts/victoryroad1.asm
+++ b/scripts/VictoryRoad1F.asm
@@ -1,14 +1,14 @@
-VictoryRoad1Script:
+VictoryRoad1F_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 5, [hl]
 	res 5, [hl]
 	call nz, .next
 	call EnableAutoTextBoxDrawing
 	ld hl, VictoryRoad1TrainerHeader0
-	ld de, VictoryRoad1ScriptPointers
-	ld a, [wVictoryRoad1CurScript]
+	ld de, VictoryRoad1F_ScriptPointers
+	ld a, [wVictoryRoad1FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wVictoryRoad1CurScript], a
+	ld [wVictoryRoad1FCurScript], a
 	ret
 .next
 	CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
@@ -18,7 +18,7 @@ VictoryRoad1Script:
 	lb bc, 6, 4
 	predef_jump ReplaceTileBlock
 
-VictoryRoad1ScriptPointers:
+VictoryRoad1F_ScriptPointers:
 	dw VictoryRoad1Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -37,7 +37,7 @@ VictoryRoad1Script0:
 CoordsData_5da5c:
 	db $0D,$11,$FF
 
-VictoryRoad1TextPointers:
+VictoryRoad1F_TextPointers:
 	dw VictoryRoad1Text1
 	dw VictoryRoad1Text2
 	dw PickUpItemText
diff --git a/scripts/victoryroad2.asm b/scripts/VictoryRoad2F.asm
index 847573d8..9dfb05ed 100755
--- a/scripts/victoryroad2.asm
+++ b/scripts/VictoryRoad2F.asm
@@ -1,4 +1,4 @@
-VictoryRoad2Script:
+VictoryRoad2F_Script:
 	ld hl, wCurrentMapScriptFlags
 	bit 6, [hl]
 	res 6, [hl]
@@ -9,10 +9,10 @@ VictoryRoad2Script:
 	call nz, VictoryRoad2Script_517c9
 	call EnableAutoTextBoxDrawing
 	ld hl, VictoryRoad2TrainerHeader0
-	ld de, VictoryRoad2ScriptPointers
-	ld a, [wVictoryRoad2CurScript]
+	ld de, VictoryRoad2F_ScriptPointers
+	ld a, [wVictoryRoad2FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wVictoryRoad2CurScript], a
+	ld [wVictoryRoad2FCurScript], a
 	ret
 
 VictoryRoad2Script_517c4:
@@ -37,7 +37,7 @@ VictoryRoad2Script_517e2:
 	predef ReplaceTileBlock
 	ret
 
-VictoryRoad2ScriptPointers:
+VictoryRoad2F_ScriptPointers:
 	dw VictoryRoad2Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -68,7 +68,7 @@ CoordsData_51816:
 	db $10,$09
 	db $FF
 
-VictoryRoad2TextPointers:
+VictoryRoad2F_TextPointers:
 	dw VictoryRoad2Text1
 	dw VictoryRoad2Text2
 	dw VictoryRoad2Text3
diff --git a/scripts/victoryroad3.asm b/scripts/VictoryRoad3F.asm
index c615091b..d145c4a1 100755
--- a/scripts/victoryroad3.asm
+++ b/scripts/VictoryRoad3F.asm
@@ -1,11 +1,11 @@
-VictoryRoad3Script:
+VictoryRoad3F_Script:
 	call VictoryRoad3Script_44996
 	call EnableAutoTextBoxDrawing
 	ld hl, VictoryRoad3TrainerHeader0
-	ld de, VictoryRoad3ScriptPointers
-	ld a, [wVictoryRoad3CurScript]
+	ld de, VictoryRoad3F_ScriptPointers
+	ld a, [wVictoryRoad3FCurScript]
 	call ExecuteCurMapScriptInTable
-	ld [wVictoryRoad3CurScript], a
+	ld [wVictoryRoad3FCurScript], a
 	ret
 
 VictoryRoad3Script_44996:
@@ -20,7 +20,7 @@ VictoryRoad3Script_44996:
 	lb bc, 5, 3
 	predef_jump ReplaceTileBlock
 
-VictoryRoad3ScriptPointers:
+VictoryRoad3F_ScriptPointers:
 	dw VictoryRoad3Script0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -43,10 +43,10 @@ VictoryRoad3Script0:
 .asm_449dc
 	CheckAndSetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2
 	jr nz, .asm_449fe
-	ld a, HS_VICTORY_ROAD_3_BOULDER
+	ld a, HS_VICTORY_ROAD_3F_BOULDER
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	ld a, HS_VICTORY_ROAD_2_BOULDER
+	ld a, HS_VICTORY_ROAD_2F_BOULDER
 	ld [wMissableObjectIndex], a
 	predef_jump ShowObject
 
@@ -56,7 +56,7 @@ VictoryRoad3Script0:
 	db $FF
 
 .asm_449fe
-	ld a, VICTORY_ROAD_2
+	ld a, VICTORY_ROAD_2F
 	ld [wDungeonWarpDestinationMap], a
 	ld hl, .coordsData_449f9
 	call IsPlayerOnDungeonWarp
@@ -74,7 +74,7 @@ VictoryRoad3Script0:
 	jp z, CheckFightingMapTrainers
 	ret
 
-VictoryRoad3TextPointers:
+VictoryRoad3F_TextPointers:
 	dw VictoryRoad3Text1
 	dw VictoryRoad3Text2
 	dw VictoryRoad3Text3
diff --git a/scripts/viridiancity.asm b/scripts/ViridianCity.asm
index 3ccdc509..b70927b2 100755
--- a/scripts/viridiancity.asm
+++ b/scripts/ViridianCity.asm
@@ -1,10 +1,10 @@
-ViridianCityScript:
+ViridianCity_Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, ViridianCityScriptPointers
+	ld hl, ViridianCity_ScriptPointers
 	ld a, [wViridianCityCurScript]
 	jp CallFunctionInTable
 
-ViridianCityScriptPointers:
+ViridianCity_ScriptPointers:
 	dw ViridianCityScript0
 	dw ViridianCityScript1
 	dw ViridianCityScript2
@@ -124,7 +124,7 @@ ViridianCityScript_190cf:
 	ld [wJoyIgnore], a
 	ret
 
-ViridianCityTextPointers:
+ViridianCity_TextPointers:
 	dw ViridianCityText1
 	dw ViridianCityText2
 	dw ViridianCityText3
diff --git a/scripts/viridianforest.asm b/scripts/ViridianForest.asm
index bce093a9..acd26b8a 100755
--- a/scripts/viridianforest.asm
+++ b/scripts/ViridianForest.asm
@@ -1,18 +1,18 @@
-ViridianForestScript:
+ViridianForest_Script:
 	call EnableAutoTextBoxDrawing
 	ld hl, ViridianForestTrainerHeader0
-	ld de, ViridianForestScriptPointers
+	ld de, ViridianForest_ScriptPointers
 	ld a, [wViridianForestCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wViridianForestCurScript], a
 	ret
 
-ViridianForestScriptPointers:
+ViridianForest_ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-ViridianForestTextPointers:
+ViridianForest_TextPointers:
 	dw ViridianForestText1
 	dw ViridianForestText2
 	dw ViridianForestText3
diff --git a/scripts/viridianforestexit.asm b/scripts/ViridianForestNorthGate.asm
index af7a8523..e421bf5b 100755
--- a/scripts/viridianforestexit.asm
+++ b/scripts/ViridianForestNorthGate.asm
@@ -1,7 +1,7 @@
-ViridianForestExitScript:
+ViridianForestNorthGate_Script:
 	jp EnableAutoTextBoxDrawing
 
-ViridianForestExitTextPointers:
+ViridianForestNorthGate_TextPointers:
 	dw ViridianForestExitText1
 	dw ViridianForestExitText2
 
diff --git a/scripts/viridianforestentrance.asm b/scripts/ViridianForestSouthGate.asm
index e24225ed..397f0eca 100755
--- a/scripts/viridianforestentrance.asm
+++ b/scripts/ViridianForestSouthGate.asm
@@ -1,7 +1,7 @@
-ViridianForestEntranceScript:
+ViridianForestSouthGate_Script:
 	jp EnableAutoTextBoxDrawing
 
-ViridianForestEntranceTextPointers:
+ViridianForestSouthGate_TextPointers:
 	dw ViridianForestEntranceText1
 	dw ViridianForestEntranceText2
 
diff --git a/scripts/viridiangym.asm b/scripts/ViridianGym.asm
index cc8dcb90..44966fef 100755
--- a/scripts/viridiangym.asm
+++ b/scripts/ViridianGym.asm
@@ -1,10 +1,10 @@
-ViridianGymScript:
+ViridianGym_Script:
 	ld hl, Gym8CityName
 	ld de, Gym8LeaderName
 	call LoadGymLeaderAndCityName
 	call EnableAutoTextBoxDrawing
 	ld hl, ViridianGymTrainerHeader0
-	ld de, ViridianGymScriptPointers
+	ld de, ViridianGym_ScriptPointers
 	ld a, [wViridianGymCurScript]
 	call ExecuteCurMapScriptInTable
 	ld [wViridianGymCurScript], a
@@ -22,7 +22,7 @@ ViridianGymScript_748d6:
 	ld [wCurMapScript], a
 	ret
 
-ViridianGymScriptPointers:
+ViridianGym_ScriptPointers:
 	dw ViridianGymScript0
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
@@ -168,7 +168,7 @@ ViridianGymScript3_74995:
 	SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE
 	jp ViridianGymScript_748d6
 
-ViridianGymTextPointers:
+ViridianGym_TextPointers:
 	dw ViridianGymText1
 	dw ViridianGymText2
 	dw ViridianGymText3
diff --git a/scripts/viridianmart.asm b/scripts/ViridianMart.asm
index 451ab989..b90d331c 100755
--- a/scripts/viridianmart.asm
+++ b/scripts/ViridianMart.asm
@@ -1,17 +1,17 @@
-ViridianMartScript:
+ViridianMart_Script:
 	call ViridianMartScript_1d47d
 	call EnableAutoTextBoxDrawing
-	ld hl, ViridianMartScriptPointers
-	ld a, [wViridianMarketCurScript]
+	ld hl, ViridianMart_ScriptPointers
+	ld a, [wViridianMartCurScript]
 	jp CallFunctionInTable
 
 ViridianMartScript_1d47d:
 	CheckEvent EVENT_OAK_GOT_PARCEL
 	jr nz, .asm_1d489
-	ld hl, ViridianMartTextPointers
+	ld hl, ViridianMart_TextPointers
 	jr .asm_1d48c
 .asm_1d489
-	ld hl, ViridianMartTextPointers + $a ; starts at ViridianMartText6
+	ld hl, ViridianMart_TextPointers2
 .asm_1d48c
 	ld a, l
 	ld [wMapTextPtr], a
@@ -19,7 +19,7 @@ ViridianMartScript_1d47d:
 	ld [wMapTextPtr+1], a
 	ret
 
-ViridianMartScriptPointers:
+ViridianMart_ScriptPointers:
 	dw ViridianMartScript0
 	dw ViridianMartScript1
 	dw ViridianMartScript2
@@ -36,7 +36,7 @@ ViridianMartScript0:
 	ld [wSimulatedJoypadStatesIndex], a
 	call StartSimulatingJoypadStates
 	ld a, $1
-	ld [wViridianMarketCurScript], a
+	ld [wViridianMartCurScript], a
 	ret
 
 RLEMovement1d4bb:
@@ -56,17 +56,18 @@ ViridianMartScript1:
 	call GiveItem
 	SetEvent EVENT_GOT_OAKS_PARCEL
 	ld a, $2
-	ld [wViridianMarketCurScript], a
+	ld [wViridianMartCurScript], a
 	; fallthrough
 ViridianMartScript2:
 	ret
 
-ViridianMartTextPointers:
+ViridianMart_TextPointers:
 	dw ViridianMartText1
 	dw ViridianMartText2
 	dw ViridianMartText3
 	dw ViridianMartText4
 	dw ViridianMartText5
+ViridianMart_TextPointers2:
 	dw ViridianCashierText
 	dw ViridianMartText2
 	dw ViridianMartText3
diff --git a/scripts/viridianhouse.asm b/scripts/ViridianNicknameHouse.asm
index 105c8fb6..000fe82b 100755
--- a/scripts/viridianhouse.asm
+++ b/scripts/ViridianNicknameHouse.asm
@@ -1,7 +1,7 @@
-ViridianHouseScript:
+ViridianNicknameHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-ViridianHouseTextPointers:
+ViridianNicknameHouse_TextPointers:
 	dw ViridianHouseText1
 	dw ViridianHouseText2
 	dw ViridianHouseText3
diff --git a/scripts/viridianpokecenter.asm b/scripts/ViridianPokecenter.asm
index 904ff47f..14c25b9f 100755
--- a/scripts/viridianpokecenter.asm
+++ b/scripts/ViridianPokecenter.asm
@@ -1,8 +1,8 @@
-ViridianPokeCenterScript:
+ViridianPokecenter_Script:
 	call Serial_TryEstablishingExternallyClockedConnection
 	jp EnableAutoTextBoxDrawing
 
-ViridianPokecenterTextPointers:
+ViridianPokecenter_TextPointers:
 	dw ViridianHealNurseText
 	dw ViridianPokeCenterText2
 	dw ViridianPokeCenterText3
diff --git a/scripts/school.asm b/scripts/ViridianSchoolHouse.asm
index 2300946b..2d9579b7 100755
--- a/scripts/school.asm
+++ b/scripts/ViridianSchoolHouse.asm
@@ -1,7 +1,7 @@
-SchoolScript:
+ViridianSchoolHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-SchoolTextPointers:
+ViridianSchoolHouse_TextPointers:
 	dw SchoolText1
 	dw SchoolText2
 
diff --git a/scripts/fuchsiahouse2.asm b/scripts/WardensHouse.asm
index 6d49fb2f..69e199c9 100755
--- a/scripts/fuchsiahouse2.asm
+++ b/scripts/WardensHouse.asm
@@ -1,7 +1,7 @@
-FuchsiaHouse2Script:
+WardensHouse_Script:
 	jp EnableAutoTextBoxDrawing
 
-FuchsiaHouse2TextPointers:
+WardensHouse_TextPointers:
 	dw FuchsiaHouse2Text1
 	dw PickUpItemText
 	dw BoulderText
diff --git a/scripts/diglettscave.asm b/scripts/diglettscave.asm
deleted file mode 100755
index 593b12a6..00000000
--- a/scripts/diglettscave.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-DiglettsCaveScript:
-	jp EnableAutoTextBoxDrawing
-
-DiglettsCaveTextPointers:
-	db "@"
diff --git a/scripts/indigoplateau.asm b/scripts/indigoplateau.asm
deleted file mode 100755
index 6a6fdb6c..00000000
--- a/scripts/indigoplateau.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-IndigoPlateauScript:
-	ret
-
-IndigoPlateauTextPointers:
diff --git a/scripts/ssanne4.asm b/scripts/ssanne4.asm
deleted file mode 100755
index c9411717..00000000
--- a/scripts/ssanne4.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-SSAnne4Script:
-	jp EnableAutoTextBoxDrawing
-
-SSAnne4TextPointers:
-	db "@"
diff --git a/scripts/undergroundpathns.asm b/scripts/undergroundpathns.asm
deleted file mode 100755
index 8c744740..00000000
--- a/scripts/undergroundpathns.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-UndergroundPathNSScript:
-	jp EnableAutoTextBoxDrawing
-
-UndergroundPathNSTextPointers:
-	db "@"
diff --git a/scripts/undergroundpathwe.asm b/scripts/undergroundpathwe.asm
deleted file mode 100755
index 921d3dab..00000000
--- a/scripts/undergroundpathwe.asm
+++ /dev/null
@@ -1,5 +0,0 @@
-UndergroundPathWEScript:
-	jp EnableAutoTextBoxDrawing
-
-UndergroundPathWETextPointers:
-	db "@"
diff --git a/text.asm b/text.asm
index 51355e33..5a760a8e 100644
--- a/text.asm
+++ b/text.asm
@@ -1,5 +1,7 @@
 INCLUDE "charmap.asm"
+
 INCLUDE "constants/text_constants.asm"
+
 TEXT_1  EQU $20
 TEXT_2  EQU TEXT_1 + 1
 TEXT_3  EQU TEXT_2 + 1
@@ -16,6 +18,7 @@ POKEDEX_TEXT EQU TEXT_11 + 1
 MOVE_NAMES   EQU POKEDEX_TEXT + 1
 
 INCLUDE "macros.asm"
+
 INCLUDE "hram.asm"
 
 
@@ -167,67 +170,67 @@ _OaksAideNoRoomText::
 	text "."
 	done
 
-INCLUDE "text/maps/viridian_forest.asm"
-INCLUDE "text/maps/mt_moon_1f.asm"
-INCLUDE "text/maps/mt_moon_b1f.asm"
-INCLUDE "text/maps/mt_moon_b2f.asm"
-INCLUDE "text/maps/ss_anne_1.asm"
-INCLUDE "text/maps/ss_anne_2.asm"
-INCLUDE "text/maps/ss_anne_3.asm"
-INCLUDE "text/maps/ss_anne_5.asm"
-INCLUDE "text/maps/ss_anne_6.asm"
-INCLUDE "text/maps/ss_anne_7.asm"
-INCLUDE "text/maps/ss_anne_8.asm"
-INCLUDE "text/maps/ss_anne_9.asm"
-INCLUDE "text/maps/ss_anne_10.asm"
-INCLUDE "text/maps/victory_road_3f.asm"
-INCLUDE "text/maps/rocket_hideout_b1f.asm"
-INCLUDE "text/maps/rocket_hideout_b2f.asm"
-INCLUDE "text/maps/rocket_hideout_b3f.asm"
-INCLUDE "text/maps/rocket_hideout_b4f.asm"
-INCLUDE "text/maps/rocket_hideout_elevator.asm"
-INCLUDE "text/maps/silph_co_2f.asm"
-INCLUDE "text/maps/silph_co_3f.asm"
-INCLUDE "text/maps/silph_co_4f.asm"
-INCLUDE "text/maps/silph_co_5f_1.asm"
+INCLUDE "text/maps/ViridianForest.asm"
+INCLUDE "text/maps/MtMoon1F.asm"
+INCLUDE "text/maps/MtMoonB1F.asm"
+INCLUDE "text/maps/MtMoonB2F.asm"
+INCLUDE "text/maps/SSAnne1F.asm"
+INCLUDE "text/maps/SSAnne2F.asm"
+INCLUDE "text/maps/SSAnne3F.asm"
+INCLUDE "text/maps/SSAnneBow.asm"
+INCLUDE "text/maps/SSAnneKitchen.asm"
+INCLUDE "text/maps/SSAnneCaptainsRoom.asm"
+INCLUDE "text/maps/SSAnne1FRooms.asm"
+INCLUDE "text/maps/SSAnne2FRooms.asm"
+INCLUDE "text/maps/SSAnneB1FRooms.asm"
+INCLUDE "text/maps/VictoryRoad3F.asm"
+INCLUDE "text/maps/RocketHideoutB1F.asm"
+INCLUDE "text/maps/RocketHideoutB2F.asm"
+INCLUDE "text/maps/RocketHideoutB3F.asm"
+INCLUDE "text/maps/RocketHideoutB4F.asm"
+INCLUDE "text/maps/RocketHideoutElevator.asm"
+INCLUDE "text/maps/SilphCo2F.asm"
+INCLUDE "text/maps/SilphCo3F.asm"
+INCLUDE "text/maps/SilphCo4F.asm"
+INCLUDE "text/maps/SilphCo5F.asm"
 
 
 SECTION "Text 2", ROMX ; BANK $21
 
-INCLUDE "text/maps/silph_co_5f_2.asm"
-INCLUDE "text/maps/silph_co_6f.asm"
-INCLUDE "text/maps/silph_co_7f.asm"
-INCLUDE "text/maps/silph_co_8f.asm"
-INCLUDE "text/maps/silph_co_9f.asm"
-INCLUDE "text/maps/silph_co_10f.asm"
-INCLUDE "text/maps/silph_co_11f.asm"
-INCLUDE "text/maps/mansion_2f.asm"
-INCLUDE "text/maps/mansion_3f.asm"
-INCLUDE "text/maps/mansion_b1f.asm"
-INCLUDE "text/maps/safari_zone_east.asm"
-INCLUDE "text/maps/safari_zone_north.asm"
-INCLUDE "text/maps/safari_zone_west.asm"
-INCLUDE "text/maps/safari_zone_center.asm"
-INCLUDE "text/maps/safari_zone_rest_house_1.asm"
-INCLUDE "text/maps/safari_zone_secret_house.asm"
-INCLUDE "text/maps/safari_zone_rest_house_2.asm"
-INCLUDE "text/maps/safari_zone_rest_house_3.asm"
-INCLUDE "text/maps/safari_zone_rest_house_4.asm"
-INCLUDE "text/maps/unknown_dungeon_b1f.asm"
-INCLUDE "text/maps/victory_road_1f.asm"
-INCLUDE "text/maps/lance.asm"
-INCLUDE "text/maps/hall_of_fame.asm"
-INCLUDE "text/maps/champion.asm"
-INCLUDE "text/maps/lorelei.asm"
-INCLUDE "text/maps/bruno.asm"
-INCLUDE "text/maps/agatha.asm"
-INCLUDE "text/maps/rock_tunnel_b2f_1.asm"
+INCLUDE "text/maps/SilphCo5F_2.asm"
+INCLUDE "text/maps/SilphCo6F.asm"
+INCLUDE "text/maps/SilphCo7F.asm"
+INCLUDE "text/maps/SilphCo8F.asm"
+INCLUDE "text/maps/SilphCo9F.asm"
+INCLUDE "text/maps/SilphCo10F.asm"
+INCLUDE "text/maps/SilphCo11F.asm"
+INCLUDE "text/maps/PokemonMansion2F.asm"
+INCLUDE "text/maps/PokemonMansion3F.asm"
+INCLUDE "text/maps/PokemonMansionB1F.asm"
+INCLUDE "text/maps/SafariZoneEast.asm"
+INCLUDE "text/maps/SafariZoneNorth.asm"
+INCLUDE "text/maps/SafariZoneWest.asm"
+INCLUDE "text/maps/SafariZoneCenter.asm"
+INCLUDE "text/maps/SafariZoneCenterRestHouse.asm"
+INCLUDE "text/maps/SafariZoneSecretHouse.asm"
+INCLUDE "text/maps/SafariZoneWestRestHouse.asm"
+INCLUDE "text/maps/SafariZoneEastRestHouse.asm"
+INCLUDE "text/maps/SafariZoneNorthRestHouse.asm"
+INCLUDE "text/maps/CeruleanCaveB1F.asm"
+INCLUDE "text/maps/VictoryRoad1F.asm"
+INCLUDE "text/maps/LancesRoom.asm"
+INCLUDE "text/maps/HallOfFame.asm"
+INCLUDE "text/maps/ChampionsRoom.asm"
+INCLUDE "text/maps/LoreleisRoom.asm"
+INCLUDE "text/maps/BrunosRoom.asm"
+INCLUDE "text/maps/AgathasRoom.asm"
+INCLUDE "text/maps/RockTunnelB1F.asm"
 
 
 SECTION "Text 3", ROMX ; BANK $22
 
-INCLUDE "text/maps/rock_tunnel_b2f_2.asm"
-INCLUDE "text/maps/seafoam_islands_b4f.asm"
+INCLUDE "text/maps/RockTunnelB1F_2.asm"
+INCLUDE "text/maps/SeafoamIslandsB4F.asm"
 
 _AIBattleWithdrawText::
 	TX_RAM wTrainerName
@@ -1531,14 +1534,14 @@ _NotVeryEffectiveText::
 _SafariZoneEatingText::
 	text "Wild @"
 	TX_RAM wEnemyMonNick
-	db $0
+	text ""
 	line "is eating!"
 	prompt
 
 _SafariZoneAngryText::
 	text "Wild @"
 	TX_RAM wEnemyMonNick
-	db $0
+	text ""
 	line "is angry!"
 	prompt
 
@@ -1929,77 +1932,77 @@ _Char00Text::
 _Char55Text::
 	text $4B,"@@"
 
-INCLUDE "text/maps/digletts_cave_route_2_entrance.asm"
-INCLUDE "text/maps/viridian_forest_exit.asm"
-INCLUDE "text/maps/route_2_house.asm"
-INCLUDE "text/maps/route_2_gate.asm"
-INCLUDE "text/maps/viridian_forest_entrance.asm"
-INCLUDE "text/maps/mt_moon_pokecenter.asm"
-INCLUDE "text/maps/saffron_gates.asm"
-INCLUDE "text/maps/daycare_1.asm"
+INCLUDE "text/maps/DiglettsCaveRoute2.asm"
+INCLUDE "text/maps/ViridianForestNorthGate.asm"
+INCLUDE "text/maps/Route2TradeHouse.asm"
+INCLUDE "text/maps/Route2Gate.asm"
+INCLUDE "text/maps/ViridianForestSouthGate.asm"
+INCLUDE "text/maps/MtMoonPokecenter.asm"
+INCLUDE "text/maps/SaffronGates.asm"
+INCLUDE "text/maps/Daycare.asm"
 
 
 SECTION "Text 4", ROMX ; BANK $23
 
-INCLUDE "text/maps/daycare_2.asm"
-INCLUDE "text/maps/underground_path_route_6_entrance.asm"
-INCLUDE "text/maps/underground_path_route_7_entrance.asm"
-INCLUDE "text/maps/underground_path_route_7_entrance_unused.asm"
-INCLUDE "text/maps/underground_path_route_8_entrance.asm"
-INCLUDE "text/maps/rock_tunnel_pokecenter.asm"
-INCLUDE "text/maps/rock_tunnel_b1f.asm"
-INCLUDE "text/maps/power_plant.asm"
-INCLUDE "text/maps/route_11_gate.asm"
-INCLUDE "text/maps/route_11_gate_upstairs.asm"
-INCLUDE "text/maps/digletts_cave_route_11_entrance.asm"
-INCLUDE "text/maps/route_12_gate.asm"
-INCLUDE "text/maps/route_12_gate_upstairs.asm"
-INCLUDE "text/maps/route_12_house.asm"
-INCLUDE "text/maps/route_15_gate.asm"
-INCLUDE "text/maps/route_15_gate_upstairs.asm"
-INCLUDE "text/maps/route_16_gate.asm"
-INCLUDE "text/maps/route_16_gate_upstairs.asm"
-INCLUDE "text/maps/route_16_house.asm"
-INCLUDE "text/maps/route_18_gate.asm"
-INCLUDE "text/maps/route_18_gate_upstairs.asm"
-INCLUDE "text/maps/pokemon_league_gate.asm"
-INCLUDE "text/maps/victory_road_2f.asm"
-INCLUDE "text/maps/bills_house.asm"
-INCLUDE "text/maps/route_1.asm"
-INCLUDE "text/maps/route_2.asm"
-INCLUDE "text/maps/route_3.asm"
-INCLUDE "text/maps/route_4.asm"
-INCLUDE "text/maps/route_5.asm"
-INCLUDE "text/maps/route_6.asm"
-INCLUDE "text/maps/route_7.asm"
-INCLUDE "text/maps/route_8.asm"
-INCLUDE "text/maps/route_9.asm"
-INCLUDE "text/maps/route_10.asm"
-INCLUDE "text/maps/route_11_1.asm"
+INCLUDE "text/maps/Daycare_2.asm"
+INCLUDE "text/maps/UndergroundPathRoute6.asm"
+INCLUDE "text/maps/UndergroundPathRoute7.asm"
+INCLUDE "text/maps/UndergroundPathRoute7Copy.asm"
+INCLUDE "text/maps/UndergroundPathRoute8.asm"
+INCLUDE "text/maps/RockTunnelPokecenter.asm"
+INCLUDE "text/maps/RockTunnel1F.asm"
+INCLUDE "text/maps/PowerPlant.asm"
+INCLUDE "text/maps/Route11Gate1F.asm"
+INCLUDE "text/maps/Route11Gate2F.asm"
+INCLUDE "text/maps/DiglettsCaveRoute11.asm"
+INCLUDE "text/maps/Route12Gate1F.asm"
+INCLUDE "text/maps/Route12Gate2F.asm"
+INCLUDE "text/maps/Route12SuperRodHouse.asm"
+INCLUDE "text/maps/Route15Gate1F.asm"
+INCLUDE "text/maps/Route15Gate2F.asm"
+INCLUDE "text/maps/Route16Gate1F.asm"
+INCLUDE "text/maps/Route16Gate2F.asm"
+INCLUDE "text/maps/Route16FlyHouse.asm"
+INCLUDE "text/maps/Route18Gate1F.asm"
+INCLUDE "text/maps/Route18Gate2F.asm"
+INCLUDE "text/maps/Route22Gate.asm"
+INCLUDE "text/maps/VictoryRoad2F.asm"
+INCLUDE "text/maps/BillsHouse.asm"
+INCLUDE "text/maps/Route1.asm"
+INCLUDE "text/maps/Route2.asm"
+INCLUDE "text/maps/Route3.asm"
+INCLUDE "text/maps/Route4.asm"
+INCLUDE "text/maps/Route5.asm"
+INCLUDE "text/maps/Route6.asm"
+INCLUDE "text/maps/Route7.asm"
+INCLUDE "text/maps/Route8.asm"
+INCLUDE "text/maps/Route9.asm"
+INCLUDE "text/maps/Route10.asm"
+INCLUDE "text/maps/Route11.asm"
 
 
 SECTION "Text 5", ROMX ; BANK $24
 
-INCLUDE "text/maps/route_11_2.asm"
-INCLUDE "text/maps/route_12.asm"
-INCLUDE "text/maps/route_13.asm"
-INCLUDE "text/maps/route_14.asm"
-INCLUDE "text/maps/route_15.asm"
-INCLUDE "text/maps/route_16.asm"
-INCLUDE "text/maps/route_17.asm"
-INCLUDE "text/maps/route_18.asm"
-INCLUDE "text/maps/route_19.asm"
-INCLUDE "text/maps/route_20.asm"
-INCLUDE "text/maps/route_21.asm"
-INCLUDE "text/maps/route_22.asm"
-INCLUDE "text/maps/route_23.asm"
-INCLUDE "text/maps/route_24_1.asm"
+INCLUDE "text/maps/Route11_2.asm"
+INCLUDE "text/maps/Route12.asm"
+INCLUDE "text/maps/Route13.asm"
+INCLUDE "text/maps/Route14.asm"
+INCLUDE "text/maps/Route15.asm"
+INCLUDE "text/maps/Route16.asm"
+INCLUDE "text/maps/Route17.asm"
+INCLUDE "text/maps/Route18.asm"
+INCLUDE "text/maps/Route19.asm"
+INCLUDE "text/maps/Route20.asm"
+INCLUDE "text/maps/Route21.asm"
+INCLUDE "text/maps/Route22.asm"
+INCLUDE "text/maps/Route23.asm"
+INCLUDE "text/maps/Route24.asm"
 
 
 SECTION "Text 6", ROMX ; BANK $25
 
-INCLUDE "text/maps/route_24_2.asm"
-INCLUDE "text/maps/route_25.asm"
+INCLUDE "text/maps/Route24_2.asm"
+INCLUDE "text/maps/Route25.asm"
 
 _FileDataDestroyedText::
 	text "The file data is"
@@ -2326,106 +2329,106 @@ _ColosseumText1::
 	text "!"
 	done
 
-INCLUDE "text/maps/reds_house_1f.asm"
-INCLUDE "text/maps/blues_house.asm"
-INCLUDE "text/maps/oaks_lab.asm"
-INCLUDE "text/maps/viridian_pokecenter.asm"
-INCLUDE "text/maps/viridian_mart.asm"
-INCLUDE "text/maps/school.asm"
-INCLUDE "text/maps/viridian_house.asm"
-INCLUDE "text/maps/viridian_gym.asm"
-INCLUDE "text/maps/museum_1f.asm"
-INCLUDE "text/maps/museum_2f.asm"
-INCLUDE "text/maps/pewter_gym_1.asm"
+INCLUDE "text/maps/RedsHouse1F.asm"
+INCLUDE "text/maps/BluesHouse.asm"
+INCLUDE "text/maps/OaksLab.asm"
+INCLUDE "text/maps/ViridianPokecenter.asm"
+INCLUDE "text/maps/ViridianMart.asm"
+INCLUDE "text/maps/ViridianSchoolHouse.asm"
+INCLUDE "text/maps/ViridianNicknameHouse.asm"
+INCLUDE "text/maps/ViridianGym.asm"
+INCLUDE "text/maps/Museum1F.asm"
+INCLUDE "text/maps/Museum2F.asm"
+INCLUDE "text/maps/PewterGym.asm"
 
 
 SECTION "Text 7", ROMX ; BANK $26
 
-INCLUDE "text/maps/pewter_gym_2.asm"
-INCLUDE "text/maps/pewter_house_1.asm"
-INCLUDE "text/maps/pewter_mart.asm"
-INCLUDE "text/maps/pewter_house_2.asm"
-INCLUDE "text/maps/pewter_pokecenter.asm"
-INCLUDE "text/maps/cerulean_trashed_house.asm"
-INCLUDE "text/maps/cerulean_trade_house.asm"
-INCLUDE "text/maps/cerulean_pokecenter.asm"
-INCLUDE "text/maps/cerulean_gym.asm"
-INCLUDE "text/maps/bike_shop.asm"
-INCLUDE "text/maps/cerulean_mart.asm"
-INCLUDE "text/maps/cerulean_badge_house.asm"
-INCLUDE "text/maps/lavender_pokecenter.asm"
-INCLUDE "text/maps/pokemon_tower_1f.asm"
-INCLUDE "text/maps/pokemon_tower_2f.asm"
-INCLUDE "text/maps/pokemon_tower_3f.asm"
-INCLUDE "text/maps/pokemon_tower_4f.asm"
-INCLUDE "text/maps/pokemon_tower_5f.asm"
-INCLUDE "text/maps/pokemon_tower_6f.asm"
-INCLUDE "text/maps/pokemon_tower_7f.asm"
-INCLUDE "text/maps/fujis_house.asm"
-INCLUDE "text/maps/lavender_mart.asm"
-INCLUDE "text/maps/lavender_house.asm"
-INCLUDE "text/maps/name_rater.asm"
-INCLUDE "text/maps/vermilion_pokecenter.asm"
-INCLUDE "text/maps/fan_club.asm"
-INCLUDE "text/maps/vermilion_mart.asm"
-INCLUDE "text/maps/vermilion_gym_1.asm"
+INCLUDE "text/maps/PewterGym_2.asm"
+INCLUDE "text/maps/PewterNidoranHouse.asm"
+INCLUDE "text/maps/PewterMart.asm"
+INCLUDE "text/maps/PewterSpeechHouse.asm"
+INCLUDE "text/maps/PewterPokecenter.asm"
+INCLUDE "text/maps/CeruleanTrashedHouse.asm"
+INCLUDE "text/maps/CeruleanTradeHouse.asm"
+INCLUDE "text/maps/CeruleanPokecenter.asm"
+INCLUDE "text/maps/CeruleanGym.asm"
+INCLUDE "text/maps/BikeShop.asm"
+INCLUDE "text/maps/CeruleanMart.asm"
+INCLUDE "text/maps/CeruleanBadgeHouse.asm"
+INCLUDE "text/maps/LavenderPokecenter.asm"
+INCLUDE "text/maps/PokemonTower1F.asm"
+INCLUDE "text/maps/PokemonTower2F.asm"
+INCLUDE "text/maps/PokemonTower3F.asm"
+INCLUDE "text/maps/PokemonTower4F.asm"
+INCLUDE "text/maps/PokemonTower5F.asm"
+INCLUDE "text/maps/PokemonTower6F.asm"
+INCLUDE "text/maps/PokemonTower7F.asm"
+INCLUDE "text/maps/MrFujisHouse.asm"
+INCLUDE "text/maps/LavenderMart.asm"
+INCLUDE "text/maps/LavenderCuboneHouse.asm"
+INCLUDE "text/maps/NameRatersHouse.asm"
+INCLUDE "text/maps/VermilionPokecenter.asm"
+INCLUDE "text/maps/PokemonFanClub.asm"
+INCLUDE "text/maps/VermilionMart.asm"
+INCLUDE "text/maps/VermilionGym.asm"
 
 
 SECTION "Text 8", ROMX ; BANK $27
 
-INCLUDE "text/maps/vermilion_gym_2.asm"
-INCLUDE "text/maps/vermilion_house.asm"
-INCLUDE "text/maps/vermilion_dock.asm"
-INCLUDE "text/maps/vermilion_fishing_house.asm"
-INCLUDE "text/maps/celadon_dept_store_1f.asm"
-INCLUDE "text/maps/celadon_dept_store_2f.asm"
-INCLUDE "text/maps/celadon_dept_store_3f.asm"
-INCLUDE "text/maps/celadon_dept_store_4f.asm"
-INCLUDE "text/maps/celadon_dept_store_roof.asm"
-INCLUDE "text/maps/celadon_mansion_1f.asm"
-INCLUDE "text/maps/celadon_mansion_2f.asm"
-INCLUDE "text/maps/celadon_mansion_3f.asm"
-INCLUDE "text/maps/celadon_mansion_4f_outside.asm"
-INCLUDE "text/maps/celadon_mansion_4f_inside.asm"
-INCLUDE "text/maps/celadon_pokecenter.asm"
-INCLUDE "text/maps/celadon_gym.asm"
-INCLUDE "text/maps/celadon_game_corner.asm"
-INCLUDE "text/maps/celadon_dept_store_5f.asm"
-INCLUDE "text/maps/celadon_prize_room.asm"
-INCLUDE "text/maps/celadon_diner.asm"
-INCLUDE "text/maps/celadon_house.asm"
-INCLUDE "text/maps/celadon_hotel.asm"
-INCLUDE "text/maps/fuchsia_mart.asm"
-INCLUDE "text/maps/fuchsia_house.asm"
-INCLUDE "text/maps/fuchsia_pokecenter.asm"
-INCLUDE "text/maps/wardens_house.asm"
-INCLUDE "text/maps/safari_zone_entrance.asm"
-INCLUDE "text/maps/fuchsia_gym_1.asm"
+INCLUDE "text/maps/VermilionGym_2.asm"
+INCLUDE "text/maps/VermilionPidgeyHouse.asm"
+INCLUDE "text/maps/VermilionDock.asm"
+INCLUDE "text/maps/VermilionOldRodHouse.asm"
+INCLUDE "text/maps/CeladonMart1F.asm"
+INCLUDE "text/maps/CeladonMart2F.asm"
+INCLUDE "text/maps/CeladonMart3F.asm"
+INCLUDE "text/maps/CeladonMart4F.asm"
+INCLUDE "text/maps/CeladonMartRoof.asm"
+INCLUDE "text/maps/CeladonMansion1F.asm"
+INCLUDE "text/maps/CeladonMansion2F.asm"
+INCLUDE "text/maps/CeladonMansion3F.asm"
+INCLUDE "text/maps/CeladonMansionRoof.asm"
+INCLUDE "text/maps/CeladonMansionRoofHouse.asm"
+INCLUDE "text/maps/CeladonPokecenter.asm"
+INCLUDE "text/maps/CeladonGym.asm"
+INCLUDE "text/maps/GameCorner.asm"
+INCLUDE "text/maps/CeladonMart5F.asm"
+INCLUDE "text/maps/GameCornerPrizeRoom.asm"
+INCLUDE "text/maps/CeladonDiner.asm"
+INCLUDE "text/maps/CeladonChiefHouse.asm"
+INCLUDE "text/maps/CeladonHotel.asm"
+INCLUDE "text/maps/FuchsiaMart.asm"
+INCLUDE "text/maps/FuchsiaBillsGrandpasHouse.asm"
+INCLUDE "text/maps/FuchsiaPokecenter.asm"
+INCLUDE "text/maps/WardensHouse.asm"
+INCLUDE "text/maps/SafariZoneGate.asm"
+INCLUDE "text/maps/FuchsiaGym.asm"
 
 
 SECTION "Text 9", ROMX ; BANK $28
 
-INCLUDE "text/maps/fuchsia_gym_2.asm"
-INCLUDE "text/maps/fuchsia_meeting_room.asm"
-INCLUDE "text/maps/fuchsia_fishing_house.asm"
-INCLUDE "text/maps/mansion_1f.asm"
-INCLUDE "text/maps/cinnabar_gym.asm"
-INCLUDE "text/maps/cinnabar_lab.asm"
-INCLUDE "text/maps/cinnabar_lab_trade_room.asm"
-INCLUDE "text/maps/cinnabar_lab_metronome_room.asm"
-INCLUDE "text/maps/cinnabar_lab_fossil_room.asm"
-INCLUDE "text/maps/cinnabar_pokecenter.asm"
-INCLUDE "text/maps/cinnabar_mart.asm"
-INCLUDE "text/maps/indigo_plateau_lobby.asm"
-INCLUDE "text/maps/copycats_house_1f.asm"
-INCLUDE "text/maps/copycats_house_2f.asm"
-INCLUDE "text/maps/fighting_dojo.asm"
-INCLUDE "text/maps/saffron_gym.asm"
-INCLUDE "text/maps/saffron_house.asm"
-INCLUDE "text/maps/saffron_mart.asm"
-INCLUDE "text/maps/silph_co_1f.asm"
-INCLUDE "text/maps/saffron_pokecenter.asm"
-INCLUDE "text/maps/mr_psychics_house.asm"
+INCLUDE "text/maps/FuchsiaGym_2.asm"
+INCLUDE "text/maps/FuchsiaMeetingRoom.asm"
+INCLUDE "text/maps/FuchsiaGoodRodHouse.asm"
+INCLUDE "text/maps/PokemonMansion1F.asm"
+INCLUDE "text/maps/CinnabarGym.asm"
+INCLUDE "text/maps/CinnabarLab.asm"
+INCLUDE "text/maps/CinnabarLabTradeRoom.asm"
+INCLUDE "text/maps/CinnabarLabMetronomeRoom.asm"
+INCLUDE "text/maps/CinnabarLabFossilRoom.asm"
+INCLUDE "text/maps/CinnabarPokecenter.asm"
+INCLUDE "text/maps/CinnabarMart.asm"
+INCLUDE "text/maps/IndigoPlateauLobby.asm"
+INCLUDE "text/maps/CopycatsHouse1F.asm"
+INCLUDE "text/maps/CopycatsHouse2F.asm"
+INCLUDE "text/maps/FightingDojo.asm"
+INCLUDE "text/maps/SaffronGym.asm"
+INCLUDE "text/maps/SaffronPidgeyHouse.asm"
+INCLUDE "text/maps/SaffronMart.asm"
+INCLUDE "text/maps/SilphCo1F.asm"
+INCLUDE "text/maps/SaffronPokecenter.asm"
+INCLUDE "text/maps/MrPsychicsHouse.asm"
 
 _PokemartGreetingText::
 	text "Hi there!"
@@ -2751,16 +2754,16 @@ _BoxIsFullText::
 	line "a #MON CENTER!"
 	done
 
-INCLUDE "text/maps/pallet_town.asm"
-INCLUDE "text/maps/viridian_city.asm"
-INCLUDE "text/maps/pewter_city.asm"
-INCLUDE "text/maps/cerulean_city.asm"
-INCLUDE "text/maps/lavender_town.asm"
-INCLUDE "text/maps/vermilion_city.asm"
-INCLUDE "text/maps/celadon_city.asm"
-INCLUDE "text/maps/fuchsia_city.asm"
-INCLUDE "text/maps/cinnabar_island.asm"
-INCLUDE "text/maps/saffron_city.asm"
+INCLUDE "text/maps/PalletTown.asm"
+INCLUDE "text/maps/ViridianCity.asm"
+INCLUDE "text/maps/PewterCity.asm"
+INCLUDE "text/maps/CeruleanCity.asm"
+INCLUDE "text/maps/LavenderTown.asm"
+INCLUDE "text/maps/VermilionCity.asm"
+INCLUDE "text/maps/CeladonCity.asm"
+INCLUDE "text/maps/FuchsiaCity.asm"
+INCLUDE "text/maps/CinnabarIsland.asm"
+INCLUDE "text/maps/SaffronCity.asm"
 
 _ItemUseBallText00::
 	text "It dodged the"
diff --git a/text/maps/agatha.asm b/text/maps/AgathasRoom.asm
index 9ef5059a..9ef5059a 100644
--- a/text/maps/agatha.asm
+++ b/text/maps/AgathasRoom.asm
diff --git a/text/maps/bike_shop.asm b/text/maps/BikeShop.asm
index 86799865..86799865 100644
--- a/text/maps/bike_shop.asm
+++ b/text/maps/BikeShop.asm
diff --git a/text/maps/bills_house.asm b/text/maps/BillsHouse.asm
index 5ece48d7..5ece48d7 100644
--- a/text/maps/bills_house.asm
+++ b/text/maps/BillsHouse.asm
diff --git a/text/maps/blues_house.asm b/text/maps/BluesHouse.asm
index 1898636a..1898636a 100644
--- a/text/maps/blues_house.asm
+++ b/text/maps/BluesHouse.asm
diff --git a/text/maps/bruno.asm b/text/maps/BrunosRoom.asm
index 9c493c4a..9c493c4a 100644
--- a/text/maps/bruno.asm
+++ b/text/maps/BrunosRoom.asm
diff --git a/text/maps/celadon_house.asm b/text/maps/CeladonChiefHouse.asm
index 19e59bd6..19e59bd6 100644
--- a/text/maps/celadon_house.asm
+++ b/text/maps/CeladonChiefHouse.asm
diff --git a/text/maps/celadon_city.asm b/text/maps/CeladonCity.asm
index 1dbd5cdf..1dbd5cdf 100644
--- a/text/maps/celadon_city.asm
+++ b/text/maps/CeladonCity.asm
diff --git a/text/maps/celadon_diner.asm b/text/maps/CeladonDiner.asm
index dc5e9350..dc5e9350 100644
--- a/text/maps/celadon_diner.asm
+++ b/text/maps/CeladonDiner.asm
diff --git a/text/maps/celadon_gym.asm b/text/maps/CeladonGym.asm
index d8f9394c..d6586035 100644
--- a/text/maps/celadon_gym.asm
+++ b/text/maps/CeladonGym.asm
@@ -68,7 +68,8 @@ _ReceivedTM21Text::
 	text "!@@"
 
 _TM21ExplanationText::
-	db $0
+	text ""
+
 	para "TM21 contains"
 	line "MEGA DRAIN."
 
diff --git a/text/maps/celadon_hotel.asm b/text/maps/CeladonHotel.asm
index f2eb059e..f2eb059e 100644
--- a/text/maps/celadon_hotel.asm
+++ b/text/maps/CeladonHotel.asm
diff --git a/text/maps/celadon_mansion_1f.asm b/text/maps/CeladonMansion1F.asm
index fc175cd5..fc175cd5 100644
--- a/text/maps/celadon_mansion_1f.asm
+++ b/text/maps/CeladonMansion1F.asm
diff --git a/text/maps/celadon_mansion_2f.asm b/text/maps/CeladonMansion2F.asm
index b2ecb4fa..b2ecb4fa 100644
--- a/text/maps/celadon_mansion_2f.asm
+++ b/text/maps/CeladonMansion2F.asm
diff --git a/text/maps/celadon_mansion_3f.asm b/text/maps/CeladonMansion3F.asm
index c8858281..c8858281 100644
--- a/text/maps/celadon_mansion_3f.asm
+++ b/text/maps/CeladonMansion3F.asm
diff --git a/text/maps/celadon_mansion_4f_outside.asm b/text/maps/CeladonMansionRoof.asm
index c8fd7ec8..c8fd7ec8 100644
--- a/text/maps/celadon_mansion_4f_outside.asm
+++ b/text/maps/CeladonMansionRoof.asm
diff --git a/text/maps/celadon_mansion_4f_inside.asm b/text/maps/CeladonMansionRoofHouse.asm
index dab81a8d..dab81a8d 100644
--- a/text/maps/celadon_mansion_4f_inside.asm
+++ b/text/maps/CeladonMansionRoofHouse.asm
diff --git a/text/maps/celadon_dept_store_1f.asm b/text/maps/CeladonMart1F.asm
index 8d805edc..8d805edc 100644
--- a/text/maps/celadon_dept_store_1f.asm
+++ b/text/maps/CeladonMart1F.asm
diff --git a/text/maps/celadon_dept_store_2f.asm b/text/maps/CeladonMart2F.asm
index 74869902..74869902 100644
--- a/text/maps/celadon_dept_store_2f.asm
+++ b/text/maps/CeladonMart2F.asm
diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/CeladonMart3F.asm
index 8211750d..8211750d 100644
--- a/text/maps/celadon_dept_store_3f.asm
+++ b/text/maps/CeladonMart3F.asm
diff --git a/text/maps/celadon_dept_store_4f.asm b/text/maps/CeladonMart4F.asm
index 78fa0b66..78fa0b66 100644
--- a/text/maps/celadon_dept_store_4f.asm
+++ b/text/maps/CeladonMart4F.asm
diff --git a/text/maps/celadon_dept_store_5f.asm b/text/maps/CeladonMart5F.asm
index 1871194b..1871194b 100644
--- a/text/maps/celadon_dept_store_5f.asm
+++ b/text/maps/CeladonMart5F.asm
diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/CeladonMartRoof.asm
index 5d104cf5..1ed52e86 100644
--- a/text/maps/celadon_dept_store_roof.asm
+++ b/text/maps/CeladonMartRoof.asm
@@ -20,7 +20,8 @@ _CeladonMartRoofText_484f9::
 	text "!@@"
 
 _CeladonMartRoofText_484fe::
-	db $0
+	text ""
+
 	para "@"
 	TX_RAM wcf4b
 	text " contains"
@@ -46,7 +47,8 @@ _CeladonMartRoofText_4850a::
 	text "!@@"
 
 _CeladonMartRoofText_4850f::
-	db $0
+	text ""
+
 	para "@"
 	TX_RAM wcf4b
 	text " contains"
@@ -70,7 +72,8 @@ _ReceivedTM49Text::
 	line "TM49!@@"
 
 _CeladonMartRoofText_48520::
-	db $0
+	text ""
+
 	para "TM49 contains"
 	line "TRI ATTACK!@@"
 
@@ -124,7 +127,7 @@ _VendingMachineText4::
 
 _VendingMachineText5::
 	TX_RAM wcf4b
-	db $0
+	text ""
 	line "popped out!"
 	done
 
diff --git a/text/maps/celadon_pokecenter.asm b/text/maps/CeladonPokecenter.asm
index a04f51c9..a04f51c9 100644
--- a/text/maps/celadon_pokecenter.asm
+++ b/text/maps/CeladonPokecenter.asm
diff --git a/text/maps/cerulean_badge_house.asm b/text/maps/CeruleanBadgeHouse.asm
index 9d701443..9d701443 100644
--- a/text/maps/cerulean_badge_house.asm
+++ b/text/maps/CeruleanBadgeHouse.asm
diff --git a/text/maps/unknown_dungeon_b1f.asm b/text/maps/CeruleanCaveB1F.asm
index 0918a3ce..0918a3ce 100644
--- a/text/maps/unknown_dungeon_b1f.asm
+++ b/text/maps/CeruleanCaveB1F.asm
diff --git a/text/maps/cerulean_city.asm b/text/maps/CeruleanCity.asm
index b5319d04..f0d2c29e 100644
--- a/text/maps/cerulean_city.asm
+++ b/text/maps/CeruleanCity.asm
@@ -73,7 +73,8 @@ _ReceivedTM28Text::
 	line "TM28!@@"
 
 _ReceivedTM28Text2::
-	db $0
+	text ""
+
 	para "I better get"
 	line "moving! Bye!@@"
 
diff --git a/text/maps/cerulean_gym.asm b/text/maps/CeruleanGym.asm
index 1d1d6d1c..1d1d6d1c 100644
--- a/text/maps/cerulean_gym.asm
+++ b/text/maps/CeruleanGym.asm
diff --git a/text/maps/cerulean_mart.asm b/text/maps/CeruleanMart.asm
index 86a74588..86a74588 100644
--- a/text/maps/cerulean_mart.asm
+++ b/text/maps/CeruleanMart.asm
diff --git a/text/maps/cerulean_pokecenter.asm b/text/maps/CeruleanPokecenter.asm
index 497fbce3..497fbce3 100644
--- a/text/maps/cerulean_pokecenter.asm
+++ b/text/maps/CeruleanPokecenter.asm
diff --git a/text/maps/cerulean_trade_house.asm b/text/maps/CeruleanTradeHouse.asm
index b606613b..b606613b 100644
--- a/text/maps/cerulean_trade_house.asm
+++ b/text/maps/CeruleanTradeHouse.asm
diff --git a/text/maps/cerulean_trashed_house.asm b/text/maps/CeruleanTrashedHouse.asm
index f79540ae..f79540ae 100644
--- a/text/maps/cerulean_trashed_house.asm
+++ b/text/maps/CeruleanTrashedHouse.asm
diff --git a/text/maps/champion.asm b/text/maps/ChampionsRoom.asm
index 61050565..61050565 100644
--- a/text/maps/champion.asm
+++ b/text/maps/ChampionsRoom.asm
diff --git a/text/maps/cinnabar_gym.asm b/text/maps/CinnabarGym.asm
index 173f94d2..1b531571 100644
--- a/text/maps/cinnabar_gym.asm
+++ b/text/maps/CinnabarGym.asm
@@ -48,7 +48,8 @@ _ReceivedTM38Text::
 	text "!@@"
 
 _TM38ExplanationText::
-	db $0
+	text ""
+
 	para "TM38 contains"
 	line "FIRE BLAST!"
 
diff --git a/text/maps/cinnabar_island.asm b/text/maps/CinnabarIsland.asm
index 352ab8ea..352ab8ea 100644
--- a/text/maps/cinnabar_island.asm
+++ b/text/maps/CinnabarIsland.asm
diff --git a/text/maps/cinnabar_lab.asm b/text/maps/CinnabarLab.asm
index a93a484d..a93a484d 100644
--- a/text/maps/cinnabar_lab.asm
+++ b/text/maps/CinnabarLab.asm
diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/CinnabarLabFossilRoom.asm
index 3978814e..95bde685 100644
--- a/text/maps/cinnabar_lab_fossil_room.asm
+++ b/text/maps/CinnabarLabFossilRoom.asm
@@ -31,7 +31,7 @@ _Lab4Text_75dd5::
 
 	para "It was @"
 	TX_RAM wcf4b
-	db $0
+	text ""
 	line "like I think!"
 	prompt
 
diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/CinnabarLabMetronomeRoom.asm
index fa04677f..fa04677f 100644
--- a/text/maps/cinnabar_lab_metronome_room.asm
+++ b/text/maps/CinnabarLabMetronomeRoom.asm
diff --git a/text/maps/cinnabar_lab_trade_room.asm b/text/maps/CinnabarLabTradeRoom.asm
index 196124e7..196124e7 100644
--- a/text/maps/cinnabar_lab_trade_room.asm
+++ b/text/maps/CinnabarLabTradeRoom.asm
diff --git a/text/maps/cinnabar_mart.asm b/text/maps/CinnabarMart.asm
index 42a41d06..42a41d06 100644
--- a/text/maps/cinnabar_mart.asm
+++ b/text/maps/CinnabarMart.asm
diff --git a/text/maps/cinnabar_pokecenter.asm b/text/maps/CinnabarPokecenter.asm
index cf481764..cf481764 100644
--- a/text/maps/cinnabar_pokecenter.asm
+++ b/text/maps/CinnabarPokecenter.asm
diff --git a/text/maps/copycats_house_1f.asm b/text/maps/CopycatsHouse1F.asm
index 3ec2b151..3ec2b151 100644
--- a/text/maps/copycats_house_1f.asm
+++ b/text/maps/CopycatsHouse1F.asm
diff --git a/text/maps/copycats_house_2f.asm b/text/maps/CopycatsHouse2F.asm
index 44988e58..561b2ac5 100644
--- a/text/maps/copycats_house_2f.asm
+++ b/text/maps/CopycatsHouse2F.asm
@@ -33,7 +33,8 @@ _ReceivedTM31Text::
 	text "!@@"
 
 _TM31ExplanationText1::
-	db $0
+	text ""
+
 	para "TM31 contains my"
 	line "favorite, MIMIC!"
 
diff --git a/text/maps/daycare_1.asm b/text/maps/Daycare.asm
index f4cec10e..2759c798 100644
--- a/text/maps/daycare_1.asm
+++ b/text/maps/Daycare.asm
@@ -14,7 +14,7 @@ _DayCareWillLookAfterMonText::
 	text "Fine, I'll look"
 	line "after @"
 	TX_RAM wcd6d
-	db $0
+	text ""
 	cont "for a while."
 	prompt
 
@@ -26,7 +26,7 @@ _DayCareComeSeeMeInAWhileText::
 _DayCareMonHasGrownText::
 	text "Your @"
 	TX_RAM wcd6d
-	db $0
+	text ""
 	line "has grown a lot!"
 
 	para "By level, it's"
@@ -40,7 +40,7 @@ _DayCareMonHasGrownText::
 _DayCareOweMoneyText::
 	text "You owe me ¥@"
 	TX_BCD wDayCareTotalCost, $c2
-	db $0
+	text ""
 	line "for the return"
 	cont "of this #MON."
 	done
@@ -56,7 +56,7 @@ _DayCareMonNeedsMoreTimeText::
 	text "Back already?"
 	line "Your @"
 	TX_RAM wcd6d
-	db $0
+	text ""
 	cont "needs some more"
 	cont "time with me."
 	prompt
diff --git a/text/maps/daycare_2.asm b/text/maps/Daycare_2.asm
index 20c0e5ad..20c0e5ad 100644
--- a/text/maps/daycare_2.asm
+++ b/text/maps/Daycare_2.asm
diff --git a/text/maps/digletts_cave_route_11_entrance.asm b/text/maps/DiglettsCaveRoute11.asm
index ecd3225e..ecd3225e 100644
--- a/text/maps/digletts_cave_route_11_entrance.asm
+++ b/text/maps/DiglettsCaveRoute11.asm
diff --git a/text/maps/digletts_cave_route_2_entrance.asm b/text/maps/DiglettsCaveRoute2.asm
index a04bbef7..a04bbef7 100644
--- a/text/maps/digletts_cave_route_2_entrance.asm
+++ b/text/maps/DiglettsCaveRoute2.asm
diff --git a/text/maps/fighting_dojo.asm b/text/maps/FightingDojo.asm
index 3df069c1..3df069c1 100644
--- a/text/maps/fighting_dojo.asm
+++ b/text/maps/FightingDojo.asm
diff --git a/text/maps/fuchsia_house.asm b/text/maps/FuchsiaBillsGrandpasHouse.asm
index 7b6556b1..7b6556b1 100644
--- a/text/maps/fuchsia_house.asm
+++ b/text/maps/FuchsiaBillsGrandpasHouse.asm
diff --git a/text/maps/fuchsia_city.asm b/text/maps/FuchsiaCity.asm
index a90d0021..a90d0021 100644
--- a/text/maps/fuchsia_city.asm
+++ b/text/maps/FuchsiaCity.asm
diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/FuchsiaGoodRodHouse.asm
index b1b8b2f2..b1b8b2f2 100644
--- a/text/maps/fuchsia_fishing_house.asm
+++ b/text/maps/FuchsiaGoodRodHouse.asm
diff --git a/text/maps/fuchsia_gym_1.asm b/text/maps/FuchsiaGym.asm
index 9108fc79..9108fc79 100644
--- a/text/maps/fuchsia_gym_1.asm
+++ b/text/maps/FuchsiaGym.asm
diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/FuchsiaGym_2.asm
index 2913fb8f..f7b39d9c 100644
--- a/text/maps/fuchsia_gym_2.asm
+++ b/text/maps/FuchsiaGym_2.asm
@@ -31,7 +31,7 @@ _ReceivedTM06Text::
 	text "!@@"
 
 _TM06ExplanationText::
-	db $0
+	text ""
 	para "TM06 contains"
 	line "TOXIC!"
 
diff --git a/text/maps/fuchsia_mart.asm b/text/maps/FuchsiaMart.asm
index 574898ce..574898ce 100644
--- a/text/maps/fuchsia_mart.asm
+++ b/text/maps/FuchsiaMart.asm
diff --git a/text/maps/fuchsia_meeting_room.asm b/text/maps/FuchsiaMeetingRoom.asm
index 10675ead..10675ead 100644
--- a/text/maps/fuchsia_meeting_room.asm
+++ b/text/maps/FuchsiaMeetingRoom.asm
diff --git a/text/maps/fuchsia_pokecenter.asm b/text/maps/FuchsiaPokecenter.asm
index a0def7eb..a0def7eb 100644
--- a/text/maps/fuchsia_pokecenter.asm
+++ b/text/maps/FuchsiaPokecenter.asm
diff --git a/text/maps/celadon_game_corner.asm b/text/maps/GameCorner.asm
index 1e59f83e..1e59f83e 100644
--- a/text/maps/celadon_game_corner.asm
+++ b/text/maps/GameCorner.asm
diff --git a/text/maps/celadon_prize_room.asm b/text/maps/GameCornerPrizeRoom.asm
index 6b2bb537..6b2bb537 100644
--- a/text/maps/celadon_prize_room.asm
+++ b/text/maps/GameCornerPrizeRoom.asm
diff --git a/text/maps/hall_of_fame.asm b/text/maps/HallOfFame.asm
index c799268b..c799268b 100644
--- a/text/maps/hall_of_fame.asm
+++ b/text/maps/HallOfFame.asm
diff --git a/text/maps/indigo_plateau_lobby.asm b/text/maps/IndigoPlateauLobby.asm
index 8487e29a..8487e29a 100644
--- a/text/maps/indigo_plateau_lobby.asm
+++ b/text/maps/IndigoPlateauLobby.asm
diff --git a/text/maps/lance.asm b/text/maps/LancesRoom.asm
index ed3dcada..ed3dcada 100644
--- a/text/maps/lance.asm
+++ b/text/maps/LancesRoom.asm
diff --git a/text/maps/lavender_house.asm b/text/maps/LavenderCuboneHouse.asm
index 66cc85a5..66cc85a5 100644
--- a/text/maps/lavender_house.asm
+++ b/text/maps/LavenderCuboneHouse.asm
diff --git a/text/maps/lavender_mart.asm b/text/maps/LavenderMart.asm
index 222712c6..222712c6 100644
--- a/text/maps/lavender_mart.asm
+++ b/text/maps/LavenderMart.asm
diff --git a/text/maps/lavender_pokecenter.asm b/text/maps/LavenderPokecenter.asm
index 3aa7b67d..3aa7b67d 100644
--- a/text/maps/lavender_pokecenter.asm
+++ b/text/maps/LavenderPokecenter.asm
diff --git a/text/maps/lavender_town.asm b/text/maps/LavenderTown.asm
index 19b6c8c8..19b6c8c8 100644
--- a/text/maps/lavender_town.asm
+++ b/text/maps/LavenderTown.asm
diff --git a/text/maps/lorelei.asm b/text/maps/LoreleisRoom.asm
index fdbb55b4..fdbb55b4 100644
--- a/text/maps/lorelei.asm
+++ b/text/maps/LoreleisRoom.asm
diff --git a/text/maps/fujis_house.asm b/text/maps/MrFujisHouse.asm
index 86cade68..f903eb6a 100644
--- a/text/maps/fujis_house.asm
+++ b/text/maps/MrFujisHouse.asm
@@ -52,7 +52,8 @@ _ReceivedFluteText::
 	text "!@@"
 
 _FluteExplanationText::
-	db $0
+	text ""
+
 	para "Upon hearing #"
 	line "FLUTE, sleeping"
 	cont "#MON will"
diff --git a/text/maps/mr_psychics_house.asm b/text/maps/MrPsychicsHouse.asm
index 7be2e11e..7be2e11e 100644
--- a/text/maps/mr_psychics_house.asm
+++ b/text/maps/MrPsychicsHouse.asm
diff --git a/text/maps/mt_moon_1f.asm b/text/maps/MtMoon1F.asm
index 761a5240..761a5240 100644
--- a/text/maps/mt_moon_1f.asm
+++ b/text/maps/MtMoon1F.asm
diff --git a/text/maps/mt_moon_b1f.asm b/text/maps/MtMoonB1F.asm
index cd995ed5..755fa583 100644
--- a/text/maps/mt_moon_b1f.asm
+++ b/text/maps/MtMoonB1F.asm
@@ -1,3 +1,3 @@
 _MtMoonText1::
-	db $0
+	text ""
 	done
diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/MtMoonB2F.asm
index 472649b9..472649b9 100644
--- a/text/maps/mt_moon_b2f.asm
+++ b/text/maps/MtMoonB2F.asm
diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/MtMoonPokecenter.asm
index 90fd811e..7bc99dae 100644
--- a/text/maps/mt_moon_pokecenter.asm
+++ b/text/maps/MtMoonPokecenter.asm
@@ -44,5 +44,5 @@ _MagikarpSalesmanText2::
 	done
 
 _MtMoonPokecenterText5::
-	db $0
+	text ""
 	done
diff --git a/text/maps/museum_1f.asm b/text/maps/Museum1F.asm
index 16431bda..16431bda 100644
--- a/text/maps/museum_1f.asm
+++ b/text/maps/Museum1F.asm
diff --git a/text/maps/museum_2f.asm b/text/maps/Museum2F.asm
index 4f34a249..4f34a249 100644
--- a/text/maps/museum_2f.asm
+++ b/text/maps/Museum2F.asm
diff --git a/text/maps/name_rater.asm b/text/maps/NameRatersHouse.asm
index 65d3e8a4..65d3e8a4 100644
--- a/text/maps/name_rater.asm
+++ b/text/maps/NameRatersHouse.asm
diff --git a/text/maps/oaks_lab.asm b/text/maps/OaksLab.asm
index 7a6f57b7..7a6f57b7 100644
--- a/text/maps/oaks_lab.asm
+++ b/text/maps/OaksLab.asm
diff --git a/text/maps/pallet_town.asm b/text/maps/PalletTown.asm
index d5eda74f..d5eda74f 100644
--- a/text/maps/pallet_town.asm
+++ b/text/maps/PalletTown.asm
diff --git a/text/maps/pewter_city.asm b/text/maps/PewterCity.asm
index 14240c9e..14240c9e 100644
--- a/text/maps/pewter_city.asm
+++ b/text/maps/PewterCity.asm
diff --git a/text/maps/pewter_gym_1.asm b/text/maps/PewterGym.asm
index 6426dd72..6426dd72 100644
--- a/text/maps/pewter_gym_1.asm
+++ b/text/maps/PewterGym.asm
diff --git a/text/maps/pewter_gym_2.asm b/text/maps/PewterGym_2.asm
index 86b97018..5312e4f2 100644
--- a/text/maps/pewter_gym_2.asm
+++ b/text/maps/PewterGym_2.asm
@@ -22,7 +22,8 @@ _ReceivedTM34Text::
 	line "TM34!@@"
 
 _TM34ExplanationText::
-	db $0
+	text ""
+
 	para "A TM contains a"
 	line "technique that"
 	cont "can be taught to"
@@ -61,7 +62,8 @@ _PewterGymText_5c4bc::
 	line "the BOULDERBADGE!@@"
 
 _PewterGymText_5c4c1::
-	db $0
+	text ""
+
 	para "That's an official"
 	line "#MON LEAGUE"
 	cont "BADGE!"
diff --git a/text/maps/pewter_mart.asm b/text/maps/PewterMart.asm
index 0d5b07a2..0d5b07a2 100644
--- a/text/maps/pewter_mart.asm
+++ b/text/maps/PewterMart.asm
diff --git a/text/maps/pewter_house_1.asm b/text/maps/PewterNidoranHouse.asm
index 450e8372..450e8372 100644
--- a/text/maps/pewter_house_1.asm
+++ b/text/maps/PewterNidoranHouse.asm
diff --git a/text/maps/pewter_pokecenter.asm b/text/maps/PewterPokecenter.asm
index 6a1b373e..6a1b373e 100644
--- a/text/maps/pewter_pokecenter.asm
+++ b/text/maps/PewterPokecenter.asm
diff --git a/text/maps/pewter_house_2.asm b/text/maps/PewterSpeechHouse.asm
index 615536f7..615536f7 100644
--- a/text/maps/pewter_house_2.asm
+++ b/text/maps/PewterSpeechHouse.asm
diff --git a/text/maps/fan_club.asm b/text/maps/PokemonFanClub.asm
index 4827f2e8..4827f2e8 100644
--- a/text/maps/fan_club.asm
+++ b/text/maps/PokemonFanClub.asm
diff --git a/text/maps/mansion_1f.asm b/text/maps/PokemonMansion1F.asm
index a3c517fb..a3c517fb 100644
--- a/text/maps/mansion_1f.asm
+++ b/text/maps/PokemonMansion1F.asm
diff --git a/text/maps/mansion_2f.asm b/text/maps/PokemonMansion2F.asm
index 378efb30..378efb30 100644
--- a/text/maps/mansion_2f.asm
+++ b/text/maps/PokemonMansion2F.asm
diff --git a/text/maps/mansion_3f.asm b/text/maps/PokemonMansion3F.asm
index 70331fdf..70331fdf 100644
--- a/text/maps/mansion_3f.asm
+++ b/text/maps/PokemonMansion3F.asm
diff --git a/text/maps/mansion_b1f.asm b/text/maps/PokemonMansionB1F.asm
index 1bc1ef89..1bc1ef89 100644
--- a/text/maps/mansion_b1f.asm
+++ b/text/maps/PokemonMansionB1F.asm
diff --git a/text/maps/pokemon_tower_1f.asm b/text/maps/PokemonTower1F.asm
index 50a2cd29..50a2cd29 100644
--- a/text/maps/pokemon_tower_1f.asm
+++ b/text/maps/PokemonTower1F.asm
diff --git a/text/maps/pokemon_tower_2f.asm b/text/maps/PokemonTower2F.asm
index 79323001..79323001 100644
--- a/text/maps/pokemon_tower_2f.asm
+++ b/text/maps/PokemonTower2F.asm
diff --git a/text/maps/pokemon_tower_3f.asm b/text/maps/PokemonTower3F.asm
index 67098e6b..67098e6b 100644
--- a/text/maps/pokemon_tower_3f.asm
+++ b/text/maps/PokemonTower3F.asm
diff --git a/text/maps/pokemon_tower_4f.asm b/text/maps/PokemonTower4F.asm
index 771325a0..771325a0 100644
--- a/text/maps/pokemon_tower_4f.asm
+++ b/text/maps/PokemonTower4F.asm
diff --git a/text/maps/pokemon_tower_5f.asm b/text/maps/PokemonTower5F.asm
index b329118d..b329118d 100644
--- a/text/maps/pokemon_tower_5f.asm
+++ b/text/maps/PokemonTower5F.asm
diff --git a/text/maps/pokemon_tower_6f.asm b/text/maps/PokemonTower6F.asm
index 7532d56d..7532d56d 100644
--- a/text/maps/pokemon_tower_6f.asm
+++ b/text/maps/PokemonTower6F.asm
diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/PokemonTower7F.asm
index 704a71eb..704a71eb 100644
--- a/text/maps/pokemon_tower_7f.asm
+++ b/text/maps/PokemonTower7F.asm
diff --git a/text/maps/power_plant.asm b/text/maps/PowerPlant.asm
index e5df6674..e5df6674 100644
--- a/text/maps/power_plant.asm
+++ b/text/maps/PowerPlant.asm
diff --git a/text/maps/reds_house_1f.asm b/text/maps/RedsHouse1F.asm
index 07768af9..07768af9 100644
--- a/text/maps/reds_house_1f.asm
+++ b/text/maps/RedsHouse1F.asm
diff --git a/text/maps/rock_tunnel_b1f.asm b/text/maps/RockTunnel1F.asm
index 472c52f8..472c52f8 100644
--- a/text/maps/rock_tunnel_b1f.asm
+++ b/text/maps/RockTunnel1F.asm
diff --git a/text/maps/rock_tunnel_b2f_1.asm b/text/maps/RockTunnelB1F.asm
index 1a565eb3..1a565eb3 100644
--- a/text/maps/rock_tunnel_b2f_1.asm
+++ b/text/maps/RockTunnelB1F.asm
diff --git a/text/maps/rock_tunnel_b2f_2.asm b/text/maps/RockTunnelB1F_2.asm
index e8e45a7f..e8e45a7f 100644
--- a/text/maps/rock_tunnel_b2f_2.asm
+++ b/text/maps/RockTunnelB1F_2.asm
diff --git a/text/maps/rock_tunnel_pokecenter.asm b/text/maps/RockTunnelPokecenter.asm
index 0fc249ff..0fc249ff 100644
--- a/text/maps/rock_tunnel_pokecenter.asm
+++ b/text/maps/RockTunnelPokecenter.asm
diff --git a/text/maps/rocket_hideout_b1f.asm b/text/maps/RocketHideoutB1F.asm
index 36117804..36117804 100644
--- a/text/maps/rocket_hideout_b1f.asm
+++ b/text/maps/RocketHideoutB1F.asm
diff --git a/text/maps/rocket_hideout_b2f.asm b/text/maps/RocketHideoutB2F.asm
index c13c3593..c13c3593 100644
--- a/text/maps/rocket_hideout_b2f.asm
+++ b/text/maps/RocketHideoutB2F.asm
diff --git a/text/maps/rocket_hideout_b3f.asm b/text/maps/RocketHideoutB3F.asm
index a146a383..a146a383 100644
--- a/text/maps/rocket_hideout_b3f.asm
+++ b/text/maps/RocketHideoutB3F.asm
diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/RocketHideoutB4F.asm
index f3ba43f3..f3ba43f3 100644
--- a/text/maps/rocket_hideout_b4f.asm
+++ b/text/maps/RocketHideoutB4F.asm
diff --git a/text/maps/rocket_hideout_elevator.asm b/text/maps/RocketHideoutElevator.asm
index 6f2aa638..6f2aa638 100644
--- a/text/maps/rocket_hideout_elevator.asm
+++ b/text/maps/RocketHideoutElevator.asm
diff --git a/text/maps/route_1.asm b/text/maps/Route1.asm
index 73188f09..73188f09 100644
--- a/text/maps/route_1.asm
+++ b/text/maps/Route1.asm
diff --git a/text/maps/route_10.asm b/text/maps/Route10.asm
index 057ddcb5..057ddcb5 100644
--- a/text/maps/route_10.asm
+++ b/text/maps/Route10.asm
diff --git a/text/maps/route_11_1.asm b/text/maps/Route11.asm
index 13e37bdf..13e37bdf 100644
--- a/text/maps/route_11_1.asm
+++ b/text/maps/Route11.asm
diff --git a/text/maps/route_11_gate.asm b/text/maps/Route11Gate1F.asm
index ef371d06..ef371d06 100644
--- a/text/maps/route_11_gate.asm
+++ b/text/maps/Route11Gate1F.asm
diff --git a/text/maps/route_11_gate_upstairs.asm b/text/maps/Route11Gate2F.asm
index 10236081..10236081 100644
--- a/text/maps/route_11_gate_upstairs.asm
+++ b/text/maps/Route11Gate2F.asm
diff --git a/text/maps/route_11_2.asm b/text/maps/Route11_2.asm
index b9b68d6d..b9b68d6d 100644
--- a/text/maps/route_11_2.asm
+++ b/text/maps/Route11_2.asm
diff --git a/text/maps/route_12.asm b/text/maps/Route12.asm
index 82696fda..82696fda 100644
--- a/text/maps/route_12.asm
+++ b/text/maps/Route12.asm
diff --git a/text/maps/route_12_gate.asm b/text/maps/Route12Gate1F.asm
index 51d75539..51d75539 100644
--- a/text/maps/route_12_gate.asm
+++ b/text/maps/Route12Gate1F.asm
diff --git a/text/maps/route_12_gate_upstairs.asm b/text/maps/Route12Gate2F.asm
index 95a89527..95a89527 100644
--- a/text/maps/route_12_gate_upstairs.asm
+++ b/text/maps/Route12Gate2F.asm
diff --git a/text/maps/route_12_house.asm b/text/maps/Route12SuperRodHouse.asm
index e04ce5fb..7dfaa74f 100644
--- a/text/maps/route_12_house.asm
+++ b/text/maps/Route12SuperRodHouse.asm
@@ -22,7 +22,8 @@ _Route12HouseText_564c5::
 	text "!@@"
 
 _Route12HouseText_564ca::
-	db $0
+	text ""
+
 	para "Fishing is a way"
 	line "of life!"
 
diff --git a/text/maps/route_13.asm b/text/maps/Route13.asm
index e2718919..e2718919 100644
--- a/text/maps/route_13.asm
+++ b/text/maps/Route13.asm
diff --git a/text/maps/route_14.asm b/text/maps/Route14.asm
index 18e85ed4..18e85ed4 100644
--- a/text/maps/route_14.asm
+++ b/text/maps/Route14.asm
diff --git a/text/maps/route_15.asm b/text/maps/Route15.asm
index a23b8500..a23b8500 100644
--- a/text/maps/route_15.asm
+++ b/text/maps/Route15.asm
diff --git a/text/maps/route_15_gate.asm b/text/maps/Route15Gate1F.asm
index 0a526142..0a526142 100644
--- a/text/maps/route_15_gate.asm
+++ b/text/maps/Route15Gate1F.asm
diff --git a/text/maps/route_15_gate_upstairs.asm b/text/maps/Route15Gate2F.asm
index ade4a358..ade4a358 100644
--- a/text/maps/route_15_gate_upstairs.asm
+++ b/text/maps/Route15Gate2F.asm
diff --git a/text/maps/route_16.asm b/text/maps/Route16.asm
index 45265829..45265829 100644
--- a/text/maps/route_16.asm
+++ b/text/maps/Route16.asm
diff --git a/text/maps/route_16_house.asm b/text/maps/Route16FlyHouse.asm
index 77efde87..77efde87 100644
--- a/text/maps/route_16_house.asm
+++ b/text/maps/Route16FlyHouse.asm
diff --git a/text/maps/route_16_gate.asm b/text/maps/Route16Gate1F.asm
index f548977f..f548977f 100644
--- a/text/maps/route_16_gate.asm
+++ b/text/maps/Route16Gate1F.asm
diff --git a/text/maps/route_16_gate_upstairs.asm b/text/maps/Route16Gate2F.asm
index d76b70ca..d76b70ca 100644
--- a/text/maps/route_16_gate_upstairs.asm
+++ b/text/maps/Route16Gate2F.asm
diff --git a/text/maps/route_17.asm b/text/maps/Route17.asm
index a0affd90..a0affd90 100644
--- a/text/maps/route_17.asm
+++ b/text/maps/Route17.asm
diff --git a/text/maps/route_18.asm b/text/maps/Route18.asm
index d09caf82..d09caf82 100644
--- a/text/maps/route_18.asm
+++ b/text/maps/Route18.asm
diff --git a/text/maps/route_18_gate.asm b/text/maps/Route18Gate1F.asm
index f2f51039..f2f51039 100644
--- a/text/maps/route_18_gate.asm
+++ b/text/maps/Route18Gate1F.asm
diff --git a/text/maps/route_18_gate_upstairs.asm b/text/maps/Route18Gate2F.asm
index 0fd2de09..0fd2de09 100644
--- a/text/maps/route_18_gate_upstairs.asm
+++ b/text/maps/Route18Gate2F.asm
diff --git a/text/maps/route_19.asm b/text/maps/Route19.asm
index 244e31d0..244e31d0 100644
--- a/text/maps/route_19.asm
+++ b/text/maps/Route19.asm
diff --git a/text/maps/route_2.asm b/text/maps/Route2.asm
index dd7becc0..dd7becc0 100644
--- a/text/maps/route_2.asm
+++ b/text/maps/Route2.asm
diff --git a/text/maps/route_20.asm b/text/maps/Route20.asm
index 1ccf0b6c..1ccf0b6c 100644
--- a/text/maps/route_20.asm
+++ b/text/maps/Route20.asm
diff --git a/text/maps/route_21.asm b/text/maps/Route21.asm
index 3451953f..3451953f 100644
--- a/text/maps/route_21.asm
+++ b/text/maps/Route21.asm
diff --git a/text/maps/route_22.asm b/text/maps/Route22.asm
index 3a1d28f0..3a1d28f0 100644
--- a/text/maps/route_22.asm
+++ b/text/maps/Route22.asm
diff --git a/text/maps/pokemon_league_gate.asm b/text/maps/Route22Gate.asm
index ac92f4b0..ce3f6824 100644
--- a/text/maps/pokemon_league_gate.asm
+++ b/text/maps/Route22Gate.asm
@@ -7,7 +7,8 @@ _Route22GateText_1e704::
 	line "BOULDERBADGE yet!@@"
 
 _Route22GateText_1e715::
-	db $0
+	text ""
+
 	para "The rules are"
 	line "rules. I can't"
 	cont "let you pass."
diff --git a/text/maps/route_23.asm b/text/maps/Route23.asm
index 2ecb020e..a7e534de 100644
--- a/text/maps/route_23.asm
+++ b/text/maps/Route23.asm
@@ -27,7 +27,8 @@ _VictoryRoadGuardText2::
 	text "!@@"
 
 _VictoryRoadGuardText_513a3::
-	db $0
+	text ""
+
 	para "OK then! Please,"
 	line "go right ahead!"
 	done
diff --git a/text/maps/route_24_1.asm b/text/maps/Route24.asm
index ae861eda..c14b689a 100644
--- a/text/maps/route_24_1.asm
+++ b/text/maps/Route24.asm
@@ -4,7 +4,8 @@ _Route24Text_51510::
 	cont "contest trainers!@@"
 
 _Route24Text_51515::
-	db $0
+	text ""
+
 	para "You just earned a"
 	line "fabulous prize!"
 	prompt
diff --git a/text/maps/route_24_2.asm b/text/maps/Route24_2.asm
index 325dea13..325dea13 100644
--- a/text/maps/route_24_2.asm
+++ b/text/maps/Route24_2.asm
diff --git a/text/maps/route_25.asm b/text/maps/Route25.asm
index 325ab348..325ab348 100644
--- a/text/maps/route_25.asm
+++ b/text/maps/Route25.asm
diff --git a/text/maps/route_2_gate.asm b/text/maps/Route2Gate.asm
index 566830f8..566830f8 100644
--- a/text/maps/route_2_gate.asm
+++ b/text/maps/Route2Gate.asm
diff --git a/text/maps/route_2_house.asm b/text/maps/Route2TradeHouse.asm
index 46fc1062..46fc1062 100644
--- a/text/maps/route_2_house.asm
+++ b/text/maps/Route2TradeHouse.asm
diff --git a/text/maps/route_3.asm b/text/maps/Route3.asm
index 966a0786..966a0786 100644
--- a/text/maps/route_3.asm
+++ b/text/maps/Route3.asm
diff --git a/text/maps/route_4.asm b/text/maps/Route4.asm
index 0a36f4cd..0a36f4cd 100644
--- a/text/maps/route_4.asm
+++ b/text/maps/Route4.asm
diff --git a/text/maps/route_5.asm b/text/maps/Route5.asm
index 54ff0f84..54ff0f84 100644
--- a/text/maps/route_5.asm
+++ b/text/maps/Route5.asm
diff --git a/text/maps/route_6.asm b/text/maps/Route6.asm
index c48b5d3d..c48b5d3d 100644
--- a/text/maps/route_6.asm
+++ b/text/maps/Route6.asm
diff --git a/text/maps/route_7.asm b/text/maps/Route7.asm
index 6500be96..6500be96 100644
--- a/text/maps/route_7.asm
+++ b/text/maps/Route7.asm
diff --git a/text/maps/route_8.asm b/text/maps/Route8.asm
index 57a9a5f9..57a9a5f9 100644
--- a/text/maps/route_8.asm
+++ b/text/maps/Route8.asm
diff --git a/text/maps/route_9.asm b/text/maps/Route9.asm
index 9975000d..9975000d 100644
--- a/text/maps/route_9.asm
+++ b/text/maps/Route9.asm
diff --git a/text/maps/ss_anne_1.asm b/text/maps/SSAnne1F.asm
index 2bbdcbac..2bbdcbac 100644
--- a/text/maps/ss_anne_1.asm
+++ b/text/maps/SSAnne1F.asm
diff --git a/text/maps/ss_anne_8.asm b/text/maps/SSAnne1FRooms.asm
index 7a09303e..7a09303e 100644
--- a/text/maps/ss_anne_8.asm
+++ b/text/maps/SSAnne1FRooms.asm
diff --git a/text/maps/ss_anne_2.asm b/text/maps/SSAnne2F.asm
index 58d804ba..58d804ba 100644
--- a/text/maps/ss_anne_2.asm
+++ b/text/maps/SSAnne2F.asm
diff --git a/text/maps/ss_anne_9.asm b/text/maps/SSAnne2FRooms.asm
index a9be8cee..a9be8cee 100644
--- a/text/maps/ss_anne_9.asm
+++ b/text/maps/SSAnne2FRooms.asm
diff --git a/text/maps/ss_anne_3.asm b/text/maps/SSAnne3F.asm
index 76490594..76490594 100644
--- a/text/maps/ss_anne_3.asm
+++ b/text/maps/SSAnne3F.asm
diff --git a/text/maps/ss_anne_10.asm b/text/maps/SSAnneB1FRooms.asm
index 7df629b5..7df629b5 100644
--- a/text/maps/ss_anne_10.asm
+++ b/text/maps/SSAnneB1FRooms.asm
diff --git a/text/maps/ss_anne_5.asm b/text/maps/SSAnneBow.asm
index 76cd5631..76cd5631 100644
--- a/text/maps/ss_anne_5.asm
+++ b/text/maps/SSAnneBow.asm
diff --git a/text/maps/ss_anne_7.asm b/text/maps/SSAnneCaptainsRoom.asm
index 7bf004da..7bf004da 100644
--- a/text/maps/ss_anne_7.asm
+++ b/text/maps/SSAnneCaptainsRoom.asm
diff --git a/text/maps/ss_anne_6.asm b/text/maps/SSAnneKitchen.asm
index 7fcc9973..7fcc9973 100644
--- a/text/maps/ss_anne_6.asm
+++ b/text/maps/SSAnneKitchen.asm
diff --git a/text/maps/safari_zone_center.asm b/text/maps/SafariZoneCenter.asm
index 09918f93..09918f93 100644
--- a/text/maps/safari_zone_center.asm
+++ b/text/maps/SafariZoneCenter.asm
diff --git a/text/maps/safari_zone_rest_house_1.asm b/text/maps/SafariZoneCenterRestHouse.asm
index b6c87818..b6c87818 100644
--- a/text/maps/safari_zone_rest_house_1.asm
+++ b/text/maps/SafariZoneCenterRestHouse.asm
diff --git a/text/maps/safari_zone_east.asm b/text/maps/SafariZoneEast.asm
index eebe5de7..eebe5de7 100644
--- a/text/maps/safari_zone_east.asm
+++ b/text/maps/SafariZoneEast.asm
diff --git a/text/maps/safari_zone_rest_house_3.asm b/text/maps/SafariZoneEastRestHouse.asm
index d5f7abc8..d5f7abc8 100644
--- a/text/maps/safari_zone_rest_house_3.asm
+++ b/text/maps/SafariZoneEastRestHouse.asm
diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/SafariZoneGate.asm
index dcc1fd9b..5c143891 100644
--- a/text/maps/safari_zone_entrance.asm
+++ b/text/maps/SafariZoneGate.asm
@@ -24,7 +24,8 @@ SafariZoneEntranceText_9e747::
 	line "30 SAFARI BALLs!@@"
 
 _SafariZoneEntranceText_75360::
-	db $0
+	text ""
+
 	para "We'll call you on"
 	line "the PA when you"
 	cont "run out of time"
diff --git a/text/maps/safari_zone_north.asm b/text/maps/SafariZoneNorth.asm
index 1e148f0b..1e148f0b 100644
--- a/text/maps/safari_zone_north.asm
+++ b/text/maps/SafariZoneNorth.asm
diff --git a/text/maps/safari_zone_rest_house_4.asm b/text/maps/SafariZoneNorthRestHouse.asm
index 93f02c8f..93f02c8f 100644
--- a/text/maps/safari_zone_rest_house_4.asm
+++ b/text/maps/SafariZoneNorthRestHouse.asm
diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/SafariZoneSecretHouse.asm
index 3df79d90..3df79d90 100644
--- a/text/maps/safari_zone_secret_house.asm
+++ b/text/maps/SafariZoneSecretHouse.asm
diff --git a/text/maps/safari_zone_west.asm b/text/maps/SafariZoneWest.asm
index dcb2fe6c..dcb2fe6c 100644
--- a/text/maps/safari_zone_west.asm
+++ b/text/maps/SafariZoneWest.asm
diff --git a/text/maps/safari_zone_rest_house_2.asm b/text/maps/SafariZoneWestRestHouse.asm
index 94802b13..94802b13 100644
--- a/text/maps/safari_zone_rest_house_2.asm
+++ b/text/maps/SafariZoneWestRestHouse.asm
diff --git a/text/maps/saffron_city.asm b/text/maps/SaffronCity.asm
index a0422c8c..a0422c8c 100644
--- a/text/maps/saffron_city.asm
+++ b/text/maps/SaffronCity.asm
diff --git a/text/maps/saffron_gates.asm b/text/maps/SaffronGates.asm
index c16e880e..9bb4601f 100644
--- a/text/maps/saffron_gates.asm
+++ b/text/maps/SaffronGates.asm
@@ -16,7 +16,8 @@ _SaffronGateText_8aaa9::
 	cont "Gee, thanks!@@"
 
 _SaffronGateText_1dff1::
-	db $0
+	text ""
+
 	para "..."
 	line "Glug glug..."
 	cont "..."
diff --git a/text/maps/saffron_gym.asm b/text/maps/SaffronGym.asm
index 419b56ac..6f49a331 100644
--- a/text/maps/saffron_gym.asm
+++ b/text/maps/SaffronGym.asm
@@ -59,7 +59,8 @@ ReceivedTM46Text::
 	line "TM46!@@"
 
 _TM46ExplanationText::
-	db $0
+	text ""
+
 	para "TM46 is PSYWAVE!"
 	line "It uses powerful"
 	cont "psychic waves to"
diff --git a/text/maps/saffron_mart.asm b/text/maps/SaffronMart.asm
index a43b0d94..a43b0d94 100644
--- a/text/maps/saffron_mart.asm
+++ b/text/maps/SaffronMart.asm
diff --git a/text/maps/saffron_house.asm b/text/maps/SaffronPidgeyHouse.asm
index 214bf089..214bf089 100644
--- a/text/maps/saffron_house.asm
+++ b/text/maps/SaffronPidgeyHouse.asm
diff --git a/text/maps/saffron_pokecenter.asm b/text/maps/SaffronPokecenter.asm
index 6548aff8..6548aff8 100644
--- a/text/maps/saffron_pokecenter.asm
+++ b/text/maps/SaffronPokecenter.asm
diff --git a/text/maps/seafoam_islands_b4f.asm b/text/maps/SeafoamIslandsB4F.asm
index 608d165f..608d165f 100644
--- a/text/maps/seafoam_islands_b4f.asm
+++ b/text/maps/SeafoamIslandsB4F.asm
diff --git a/text/maps/silph_co_10f.asm b/text/maps/SilphCo10F.asm
index e916c64a..e916c64a 100644
--- a/text/maps/silph_co_10f.asm
+++ b/text/maps/SilphCo10F.asm
diff --git a/text/maps/silph_co_11f.asm b/text/maps/SilphCo11F.asm
index fbaa6086..fbaa6086 100644
--- a/text/maps/silph_co_11f.asm
+++ b/text/maps/SilphCo11F.asm
diff --git a/text/maps/silph_co_1f.asm b/text/maps/SilphCo1F.asm
index 1ef80189..1ef80189 100644
--- a/text/maps/silph_co_1f.asm
+++ b/text/maps/SilphCo1F.asm
diff --git a/text/maps/silph_co_2f.asm b/text/maps/SilphCo2F.asm
index bd87630a..bd87630a 100644
--- a/text/maps/silph_co_2f.asm
+++ b/text/maps/SilphCo2F.asm
diff --git a/text/maps/silph_co_3f.asm b/text/maps/SilphCo3F.asm
index b6a023f9..b6a023f9 100644
--- a/text/maps/silph_co_3f.asm
+++ b/text/maps/SilphCo3F.asm
diff --git a/text/maps/silph_co_4f.asm b/text/maps/SilphCo4F.asm
index 5b484ec7..5b484ec7 100644
--- a/text/maps/silph_co_4f.asm
+++ b/text/maps/SilphCo4F.asm
diff --git a/text/maps/silph_co_5f_1.asm b/text/maps/SilphCo5F.asm
index dab42539..dab42539 100644
--- a/text/maps/silph_co_5f_1.asm
+++ b/text/maps/SilphCo5F.asm
diff --git a/text/maps/silph_co_5f_2.asm b/text/maps/SilphCo5F_2.asm
index 3c1b8ead..3c1b8ead 100644
--- a/text/maps/silph_co_5f_2.asm
+++ b/text/maps/SilphCo5F_2.asm
diff --git a/text/maps/silph_co_6f.asm b/text/maps/SilphCo6F.asm
index 90456b5c..90456b5c 100644
--- a/text/maps/silph_co_6f.asm
+++ b/text/maps/SilphCo6F.asm
diff --git a/text/maps/silph_co_7f.asm b/text/maps/SilphCo7F.asm
index 1cc2bc30..1cc2bc30 100644
--- a/text/maps/silph_co_7f.asm
+++ b/text/maps/SilphCo7F.asm
diff --git a/text/maps/silph_co_8f.asm b/text/maps/SilphCo8F.asm
index fabae5e6..fabae5e6 100644
--- a/text/maps/silph_co_8f.asm
+++ b/text/maps/SilphCo8F.asm
diff --git a/text/maps/silph_co_9f.asm b/text/maps/SilphCo9F.asm
index fd1aa91c..fd1aa91c 100644
--- a/text/maps/silph_co_9f.asm
+++ b/text/maps/SilphCo9F.asm
diff --git a/text/maps/underground_path_route_6_entrance.asm b/text/maps/UndergroundPathRoute6.asm
index dacc44f7..dacc44f7 100644
--- a/text/maps/underground_path_route_6_entrance.asm
+++ b/text/maps/UndergroundPathRoute6.asm
diff --git a/text/maps/underground_path_route_7_entrance.asm b/text/maps/UndergroundPathRoute7.asm
index 5cde3614..5cde3614 100644
--- a/text/maps/underground_path_route_7_entrance.asm
+++ b/text/maps/UndergroundPathRoute7.asm
diff --git a/text/maps/underground_path_route_7_entrance_unused.asm b/text/maps/UndergroundPathRoute7Copy.asm
index 4e0dc3ca..4e0dc3ca 100644
--- a/text/maps/underground_path_route_7_entrance_unused.asm
+++ b/text/maps/UndergroundPathRoute7Copy.asm
diff --git a/text/maps/underground_path_route_8_entrance.asm b/text/maps/UndergroundPathRoute8.asm
index da785c8e..da785c8e 100644
--- a/text/maps/underground_path_route_8_entrance.asm
+++ b/text/maps/UndergroundPathRoute8.asm
diff --git a/text/maps/vermilion_city.asm b/text/maps/VermilionCity.asm
index b060a123..b060a123 100644
--- a/text/maps/vermilion_city.asm
+++ b/text/maps/VermilionCity.asm
diff --git a/text/maps/vermilion_dock.asm b/text/maps/VermilionDock.asm
index 5d998e82..5d998e82 100644
--- a/text/maps/vermilion_dock.asm
+++ b/text/maps/VermilionDock.asm
diff --git a/text/maps/vermilion_gym_1.asm b/text/maps/VermilionGym.asm
index f718d899..f718d899 100644
--- a/text/maps/vermilion_gym_1.asm
+++ b/text/maps/VermilionGym.asm
diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/VermilionGym_2.asm
index d0a01932..7f645d59 100644
--- a/text/maps/vermilion_gym_2.asm
+++ b/text/maps/VermilionGym_2.asm
@@ -30,7 +30,8 @@ _ReceivedTM24Text::
 	text "!@@"
 
 _TM24ExplanationText::
-	db $0
+	text ""
+
 	para "TM24 contains"
 	line "THUNDERBOLT!"
 
diff --git a/text/maps/vermilion_mart.asm b/text/maps/VermilionMart.asm
index 10743989..10743989 100644
--- a/text/maps/vermilion_mart.asm
+++ b/text/maps/VermilionMart.asm
diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/VermilionOldRodHouse.asm
index 6857bb5b..32526e36 100644
--- a/text/maps/vermilion_fishing_house.asm
+++ b/text/maps/VermilionOldRodHouse.asm
@@ -22,7 +22,8 @@ _VermilionHouse2Text_560b6::
 	text "!@@"
 
 _VermilionHouse2Text_560bb::
-	db $0
+	text ""
+
 	para "Fishing is a way"
 	line "of life!"
 
diff --git a/text/maps/vermilion_house.asm b/text/maps/VermilionPidgeyHouse.asm
index 91c18708..91c18708 100644
--- a/text/maps/vermilion_house.asm
+++ b/text/maps/VermilionPidgeyHouse.asm
diff --git a/text/maps/vermilion_pokecenter.asm b/text/maps/VermilionPokecenter.asm
index c9e9a581..c9e9a581 100644
--- a/text/maps/vermilion_pokecenter.asm
+++ b/text/maps/VermilionPokecenter.asm
diff --git a/text/maps/victory_road_1f.asm b/text/maps/VictoryRoad1F.asm
index 1523db88..1523db88 100644
--- a/text/maps/victory_road_1f.asm
+++ b/text/maps/VictoryRoad1F.asm
diff --git a/text/maps/victory_road_2f.asm b/text/maps/VictoryRoad2F.asm
index ec9dcf4f..ec9dcf4f 100644
--- a/text/maps/victory_road_2f.asm
+++ b/text/maps/VictoryRoad2F.asm
diff --git a/text/maps/victory_road_3f.asm b/text/maps/VictoryRoad3F.asm
index 07e0be70..07e0be70 100644
--- a/text/maps/victory_road_3f.asm
+++ b/text/maps/VictoryRoad3F.asm
diff --git a/text/maps/viridian_city.asm b/text/maps/ViridianCity.asm
index 67ab5c40..67ab5c40 100644
--- a/text/maps/viridian_city.asm
+++ b/text/maps/ViridianCity.asm
diff --git a/text/maps/viridian_forest.asm b/text/maps/ViridianForest.asm
index 813b193a..813b193a 100644
--- a/text/maps/viridian_forest.asm
+++ b/text/maps/ViridianForest.asm
diff --git a/text/maps/viridian_forest_exit.asm b/text/maps/ViridianForestNorthGate.asm
index ab6a5a1d..ab6a5a1d 100644
--- a/text/maps/viridian_forest_exit.asm
+++ b/text/maps/ViridianForestNorthGate.asm
diff --git a/text/maps/viridian_forest_entrance.asm b/text/maps/ViridianForestSouthGate.asm
index c1a8df22..c1a8df22 100644
--- a/text/maps/viridian_forest_entrance.asm
+++ b/text/maps/ViridianForestSouthGate.asm
diff --git a/text/maps/viridian_gym.asm b/text/maps/ViridianGym.asm
index f87d8d58..4c7b5207 100644
--- a/text/maps/viridian_gym.asm
+++ b/text/maps/ViridianGym.asm
@@ -64,7 +64,8 @@ _ReceivedTM27Text::
 	line "TM27!@@"
 
 _TM27ExplanationText::
-	db $0
+	text ""
+
 	para "TM27 is FISSURE!"
 	line "It will take out"
 	cont "#MON with just"
diff --git a/text/maps/viridian_mart.asm b/text/maps/ViridianMart.asm
index 61750afe..61750afe 100644
--- a/text/maps/viridian_mart.asm
+++ b/text/maps/ViridianMart.asm
diff --git a/text/maps/viridian_house.asm b/text/maps/ViridianNicknameHouse.asm
index 757f597a..757f597a 100644
--- a/text/maps/viridian_house.asm
+++ b/text/maps/ViridianNicknameHouse.asm
diff --git a/text/maps/viridian_pokecenter.asm b/text/maps/ViridianPokecenter.asm
index 4ac18bf6..4ac18bf6 100644
--- a/text/maps/viridian_pokecenter.asm
+++ b/text/maps/ViridianPokecenter.asm
diff --git a/text/maps/school.asm b/text/maps/ViridianSchoolHouse.asm
index f6041e0d..f6041e0d 100644
--- a/text/maps/school.asm
+++ b/text/maps/ViridianSchoolHouse.asm
diff --git a/text/maps/wardens_house.asm b/text/maps/WardensHouse.asm
index 9d40cace..7efddb90 100644
--- a/text/maps/wardens_house.asm
+++ b/text/maps/WardensHouse.asm
@@ -23,7 +23,8 @@ _WardenTeethText1::
 	cont "WARDEN!@@"
 
 _WardenTeethText2::
-	db $0
+	text ""
+
 	para "The WARDEN popped"
 	line "in his teeth!"
 	prompt
diff --git a/wram.asm b/wram.asm
index b59cfaad..42485b1c 100755
--- a/wram.asm
+++ b/wram.asm
@@ -1,4 +1,3 @@
-
 INCLUDE "constants.asm"
 
 flag_array: MACRO
@@ -2672,8 +2671,6 @@ wMissableObjectList:: ; d5ce
 
 wGameProgressFlags:: ; d5f0
 ; $c8 bytes
-	ds 0
-
 wOaksLabCurScript:: ; d5f0
 	ds 1
 wPalletTownCurScript:: ; d5f1
@@ -2713,31 +2710,31 @@ wRoute9CurScript:: ; d604
 	ds 1
 wRoute10CurScript:: ; d605
 	ds 1
-wMtMoon1CurScript:: ; d606
+wMtMoon1FCurScript:: ; d606
 	ds 1
-wMtMoon3CurScript:: ; d607
+wMtMoonB2FCurScript:: ; d607
 	ds 1
-wSSAnne8CurScript:: ; d608
+wSSAnne1FRoomsCurScript:: ; d608
 	ds 1
-wSSAnne9CurScript:: ; d609
+wSSAnne2FRoomsCurScript:: ; d609
 	ds 1
 wRoute22CurScript:: ; d60a
 	ds 1
 	ds 1
-wRedsHouse2CurScript:: ; d60c
+wRedsHouse2FCurScript:: ; d60c
 	ds 1
-wViridianMarketCurScript:: ; d60d
+wViridianMartCurScript:: ; d60d
 	ds 1
 wRoute22GateCurScript:: ; d60e
 	ds 1
 wCeruleanCityCurScript:: ; d60f
 	ds 1
 	ds 7
-wSSAnne5CurScript:: ; d617
+wSSAnneBowCurScript:: ; d617
 	ds 1
 wViridianForestCurScript:: ; d618
 	ds 1
-wMuseum1fCurScript:: ; d619
+wMuseum1FCurScript:: ; d619
 	ds 1
 wRoute13CurScript:: ; d61a
 	ds 1
@@ -2749,11 +2746,11 @@ wRoute19CurScript:: ; d61d
 	ds 1
 wRoute21CurScript:: ; d61e
 	ds 1
-wSafariZoneEntranceCurScript:: ; d61f
+wSafariZoneGateCurScript:: ; d61f
 	ds 1
-wRockTunnel2CurScript:: ; d620
+wRockTunnelB1FCurScript:: ; d620
 	ds 1
-wRockTunnel1CurScript:: ; d621
+wRockTunnel1FCurScript:: ; d621
 	ds 1
 	ds 1
 wRoute11CurScript:: ; d623
@@ -2768,29 +2765,29 @@ wRoute18CurScript:: ; d627
 	ds 1
 wRoute20CurScript:: ; d628
 	ds 1
-wSSAnne10CurScript:: ; d629
+wSSAnneB1FRoomsCurScript:: ; d629
 	ds 1
 wVermilionCityCurScript:: ; d62a
 	ds 1
-wPokemonTower2CurScript:: ; d62b
+wPokemonTower2FCurScript:: ; d62b
 	ds 1
-wPokemonTower3CurScript:: ; d62c
+wPokemonTower3FCurScript:: ; d62c
 	ds 1
-wPokemonTower4CurScript:: ; d62d
+wPokemonTower4FCurScript:: ; d62d
 	ds 1
-wPokemonTower5CurScript:: ; d62e
+wPokemonTower5FCurScript:: ; d62e
 	ds 1
-wPokemonTower6CurScript:: ; d62f
+wPokemonTower6FCurScript:: ; d62f
 	ds 1
-wPokemonTower7CurScript:: ; d630
+wPokemonTower7FCurScript:: ; d630
 	ds 1
-wRocketHideout1CurScript:: ; d631
+wRocketHideoutB1FCurScript:: ; d631
 	ds 1
-wRocketHideout2CurScript:: ; d632
+wRocketHideoutB2FCurScript:: ; d632
 	ds 1
-wRocketHideout3CurScript:: ; d633
+wRocketHideoutB3FCurScript:: ; d633
 	ds 1
-wRocketHideout4CurScript:: ; d634
+wRocketHideoutB4FCurScript:: ; d634
 	ds 2
 wRoute6GateCurScript:: ; d636
 	ds 1
@@ -2798,57 +2795,57 @@ wRoute8GateCurScript:: ; d637
 	ds 2
 wCinnabarIslandCurScript:: ; d639
 	ds 1
-wMansion1CurScript:: ; d63a
+wPokemonMansion1FCurScript:: ; d63a
 	ds 2
-wMansion2CurScript:: ; d63c
+wPokemonMansion2FCurScript:: ; d63c
 	ds 1
-wMansion3CurScript:: ; d63d
+wPokemonMansion3FCurScript:: ; d63d
 	ds 1
-wMansion4CurScript:: ; d63e
+wPokemonMansionB1FCurScript:: ; d63e
 	ds 1
-wVictoryRoad2CurScript:: ; d63f
+wVictoryRoad2FCurScript:: ; d63f
 	ds 1
-wVictoryRoad3CurScript:: ; d640
+wVictoryRoad3FCurScript:: ; d640
 	ds 2
 wFightingDojoCurScript:: ; d642
 	ds 1
-wSilphCo2CurScript:: ; d643
+wSilphCo2FCurScript:: ; d643
 	ds 1
-wSilphCo3CurScript:: ; d644
+wSilphCo3FCurScript:: ; d644
 	ds 1
-wSilphCo4CurScript:: ; d645
+wSilphCo4FCurScript:: ; d645
 	ds 1
-wSilphCo5CurScript:: ; d646
+wSilphCo5FCurScript:: ; d646
 	ds 1
-wSilphCo6CurScript:: ; d647
+wSilphCo6FCurScript:: ; d647
 	ds 1
-wSilphCo7CurScript:: ; d648
+wSilphCo7FCurScript:: ; d648
 	ds 1
-wSilphCo8CurScript:: ; d649
+wSilphCo8FCurScript:: ; d649
 	ds 1
-wSilphCo9CurScript:: ; d64a
+wSilphCo9FCurScript:: ; d64a
 	ds 1
-wHallOfFameRoomCurScript:: ; d64b
+wHallOfFameCurScript:: ; d64b
 	ds 1
-wGaryCurScript:: ; d64c
+wChampionsRoomCurScript:: ; d64c
 	ds 1
-wLoreleiCurScript:: ; d64d
+wLoreleisRoomCurScript:: ; d64d
 	ds 1
-wBrunoCurScript:: ; d64e
+wBrunosRoomCurScript:: ; d64e
 	ds 1
-wAgathaCurScript:: ; d64f
+wAgathasRoomCurScript:: ; d64f
 	ds 1
-wUnknownDungeon3CurScript:: ; d650
+wCeruleanCaveB1FCurScript:: ; d650
 	ds 1
-wVictoryRoad1CurScript:: ; d651
+wVictoryRoad1FCurScript:: ; d651
 	ds 1
 	ds 1
-wLanceCurScript:: ; d653
+wLancesRoomCurScript:: ; d653
 	ds 1
 	ds 4
-wSilphCo10CurScript:: ; d658
+wSilphCo10FCurScript:: ; d658
 	ds 1
-wSilphCo11CurScript:: ; d659
+wSilphCo11FCurScript:: ; d659
 	ds 1
 	ds 1
 wFuchsiaGymCurScript:: ; d65b
@@ -2858,30 +2855,28 @@ wSaffronGymCurScript:: ; d65c
 	ds 1
 wCinnabarGymCurScript:: ; d65e
 	ds 1
-wCeladonGameCornerCurScript:: ; d65f
+wGameCornerCurScript:: ; d65f
 	ds 1
-wRoute16GateCurScript:: ; d660
+wRoute16Gate1FCurScript:: ; d660
 	ds 1
 wBillsHouseCurScript:: ; d661
 	ds 1
 wRoute5GateCurScript:: ; d662
 	ds 1
 wPowerPlantCurScript:: ; d663
-; overload
-	ds 0
 wRoute7GateCurScript:: ; d663
 ; overload
 	ds 1
 	ds 1
-wSSAnne2CurScript:: ; d665
+wSSAnne2FCurScript:: ; d665
 	ds 1
-wSeafoamIslands4CurScript:: ; d666
+wSeafoamIslandsB3FCurScript:: ; d666
 	ds 1
 wRoute23CurScript:: ; d667
 	ds 1
-wSeafoamIslands5CurScript:: ; d668
+wSeafoamIslandsB4FCurScript:: ; d668
 	ds 1
-wRoute18GateCurScript:: ; d669
+wRoute18Gate1FCurScript:: ; d669
 	ds 1
 
 	ds 78