757 files changed, 1811 insertions, 2868 deletions

diff --git a/.gitignore b/.gitignore
index 842da01c6..6e5e11541 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ pokeld
 pokeobjcopy
 src/*.s
 tools/agbcc
+ld_script_ruby.txt
+ld_script_sapphire.txt
diff --git a/Makefile b/Makefile
index fcfe3229f..0c6767587 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ CPP      := $(DEVKITARM)/bin/arm-none-eabi-cpp
 CPPFLAGS := -I tools/agbcc/include -iquote include -nostdinc -undef
 
 LD      := $(DEVKITARM)/bin/arm-none-eabi-ld
-pokeruby_LDFLAGS := -T ld_script_ruby.txt -T iwram_syms.txt -T ewram_syms.txt
-pokesapphire_LDFLAGS := -T ld_script_sapphire.txt -T iwram_syms.txt -T ewram_syms.txt
+pokeruby_LDFLAGS := -T ld_script_ruby.txt -T iwram_syms.txt -T ewram_syms.txt -Map pokeruby.map
+pokesapphire_LDFLAGS := -T ld_script_sapphire.txt -T iwram_syms.txt -T ewram_syms.txt -Map pokesapphire.map
 
 OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy
 
@@ -63,11 +63,11 @@ compare: both
 	@$(SHA1) rom.sha1
 
 clean:
-	rm -f $(ROM) $(ELF) $(OBJS) $(pokeruby_OBJS) $(pokesapphire_OBJS) $(C_SRCS:%.c=%.i)
+	rm -f $(ROM) $(ELF) $(OBJS) $(pokeruby_OBJS) $(pokesapphire_OBJS) $(C_SRCS:%.c=%.i) pokeruby.map pokesapphire.map
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' \) -exec rm {} +
 
 tidy:
-	rm -f $(ROM) $(ELF) $(OBJS) $(pokeruby_OBJS) $(pokesapphire_OBJS) $(C_SRCS:%.c=%.i)
+	rm -f $(ROM) $(ELF) $(OBJS) $(pokeruby_OBJS) $(pokesapphire_OBJS) $(C_SRCS:%.c=%.i) pokeruby.map pokesapphire.map
 
 include castform.mk
 include tilesets.mk
@@ -108,6 +108,7 @@ src/%_sapphire.o: src/%.c
 
 asm/%_ruby.o: dep = $(shell $(SCANINC) asm/$*.s)
 asm/%_sapphire.o: dep = $(shell $(SCANINC) asm/$*.s)
+
 asm/%_ruby.o: asm/%.s $$(dep)
 	$(AS) $(ASFLAGS) --defsym RUBY=1 -o $@ $<
 asm/%_sapphire.o: asm/%.s $$(dep)
@@ -115,6 +116,7 @@ asm/%_sapphire.o: asm/%.s $$(dep)
 
 data/%_ruby.o: dep = $(shell $(SCANINC) data/$*.s)
 data/%_sapphire.o: dep = $(shell $(SCANINC) data/$*.s)
+
 data/%_ruby.o: data/%.s $$(dep)
 	$(PREPROC) $< charmap.txt | $(AS) $(ASFLAGS) --defsym RUBY=1 -o $@
 data/%_sapphire.o: data/%.s $$(dep)
diff --git a/data/data2.s b/data/data2.s
index cd7b2797d..9f73b928d 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -2002,1194 +2002,12 @@ gUnknown_082166D8: @ 82166D8
 	.include "data/tilesets/metatiles.s"
 
 @ 8286CF4
-AbandonedShip_CaptainsOffice_Tileset:: @ 8286CF4
-AbandonedShip_Corridors_1F_Tileset:: @ 8286CF4
-AbandonedShip_Corridors_B1F_Tileset:: @ 8286CF4
-AbandonedShip_Deck_Tileset:: @ 8286CF4
-AbandonedShip_HiddenFloorCorridors_Tileset:: @ 8286CF4
-AbandonedShip_HiddenFloorRooms_Tileset:: @ 8286CF4
-AbandonedShip_Room_B1F_Tileset:: @ 8286CF4
-AbandonedShip_Rooms2_1F_Tileset:: @ 8286CF4
-AbandonedShip_Rooms2_B1F_Tileset:: @ 8286CF4
-AbandonedShip_Rooms_1F_Tileset:: @ 8286CF4
-AbandonedShip_Rooms_B1F_Tileset:: @ 8286CF4
-AbandonedShip_Underwater1_Tileset:: @ 8286CF4
-AbandonedShip_Underwater2_Tileset:: @ 8286CF4
-AncientTomb_Tileset:: @ 8286CF4
-AquaHideout_1F_Tileset:: @ 8286CF4
-AquaHideout_B1F_Tileset:: @ 8286CF4
-AquaHideout_B2F_Tileset:: @ 8286CF4
-BattleTower_Outside_Tileset:: @ 8286CF4
-CaveOfOrigin_1F_Tileset:: @ 8286CF4
-CaveOfOrigin_B1F_Tileset:: @ 8286CF4
-CaveOfOrigin_B2F_Tileset:: @ 8286CF4
-CaveOfOrigin_B3F_Tileset:: @ 8286CF4
-CaveOfOrigin_B4F_Tileset:: @ 8286CF4
-CaveOfOrigin_Entrance_Tileset:: @ 8286CF4
-DesertRuins_Tileset:: @ 8286CF4
-DewfordTown_Tileset:: @ 8286CF4
-EverGrandeCity_Tileset:: @ 8286CF4
-FallarborTown_Tileset:: @ 8286CF4
-FieryPath_Tileset:: @ 8286CF4
-FortreeCity_Tileset:: @ 8286CF4
-GraniteCave_1F_Tileset:: @ 8286CF4
-GraniteCave_B1F_Tileset:: @ 8286CF4
-GraniteCave_B2F_Tileset:: @ 8286CF4
-GraniteCave_StevensRoom_Tileset:: @ 8286CF4
-InsideOfTruck_Tileset:: @ 8286CF4
-IslandCave_Tileset:: @ 8286CF4
-JaggedPass_Tileset:: @ 8286CF4
-LavaridgeTown_Tileset:: @ 8286CF4
-LilycoveCity_EmptyMap_Tileset:: @ 8286CF4
-LilycoveCity_Tileset:: @ 8286CF4
-LinkContestRoom1_Tileset:: @ 8286CF4
-LinkContestRoom2_Tileset:: @ 8286CF4
-LinkContestRoom3_Tileset:: @ 8286CF4
-LinkContestRoom4_Tileset:: @ 8286CF4
-LinkContestRoom5_Tileset:: @ 8286CF4
-LinkContestRoom6_Tileset:: @ 8286CF4
-LittlerootTown_Tileset:: @ 8286CF4
-MagmaHideout_1F_Tileset:: @ 8286CF4
-MagmaHideout_B1F_Tileset:: @ 8286CF4
-MagmaHideout_B2F_Tileset:: @ 8286CF4
-MauvilleCity_BikeShop_Tileset:: @ 8286CF4
-MauvilleCity_Tileset:: @ 8286CF4
-MeteorFalls_1F_1R_Tileset:: @ 8286CF4
-MeteorFalls_1F_2R_Tileset:: @ 8286CF4
-MeteorFalls_B1F_1R_Tileset:: @ 8286CF4
-MeteorFalls_B1F_2R_Tileset:: @ 8286CF4
-MossdeepCity_SpaceCenter_1F_Tileset:: @ 8286CF4
-MossdeepCity_SpaceCenter_2F_Tileset:: @ 8286CF4
-MossdeepCity_Tileset:: @ 8286CF4
-MtChimney_Tileset:: @ 8286CF4
-MtPyre_1F_Tileset:: @ 8286CF4
-MtPyre_2F_Tileset:: @ 8286CF4
-MtPyre_3F_Tileset:: @ 8286CF4
-MtPyre_4F_Tileset:: @ 8286CF4
-MtPyre_5F_Tileset:: @ 8286CF4
-MtPyre_6F_Tileset:: @ 8286CF4
-MtPyre_Exterior_Tileset:: @ 8286CF4
-MtPyre_Summit_Tileset:: @ 8286CF4
-NewMauville_Entrance_Tileset:: @ 8286CF4
-NewMauville_Inside_Tileset:: @ 8286CF4
-OldaleTown_Tileset:: @ 8286CF4
-PacifidlogTown_Tileset:: @ 8286CF4
-PetalburgCity_Tileset:: @ 8286CF4
-PetalburgWoods_Tileset:: @ 8286CF4
-Route101_Tileset:: @ 8286CF4
-Route102_Tileset:: @ 8286CF4
-Route103_Tileset:: @ 8286CF4
-Route104_Prototype_Tileset:: @ 8286CF4
-Route104_Tileset:: @ 8286CF4
-Route105_Tileset:: @ 8286CF4
-Route106_Tileset:: @ 8286CF4
-Route107_Tileset:: @ 8286CF4
-Route108_Tileset:: @ 8286CF4
-Route109_Tileset:: @ 8286CF4
-Route110_Tileset:: @ 8286CF4
-Route111_Tileset:: @ 8286CF4
-Route112_CableCarStation_Tileset:: @ 8286CF4
-Route112_Tileset:: @ 8286CF4
-Route113_Tileset:: @ 8286CF4
-Route114_FossilManiacsTunnel_Tileset:: @ 8286CF4
-Route114_Tileset:: @ 8286CF4
-Route115_Tileset:: @ 8286CF4
-Route116_Tileset:: @ 8286CF4
-Route117_Tileset:: @ 8286CF4
-Route118_Tileset:: @ 8286CF4
-Route119_Tileset:: @ 8286CF4
-Route120_Tileset:: @ 8286CF4
-Route121_Tileset:: @ 8286CF4
-Route122_Tileset:: @ 8286CF4
-Route123_Tileset:: @ 8286CF4
-Route124_Tileset:: @ 8286CF4
-Route125_Tileset:: @ 8286CF4
-Route126_Tileset:: @ 8286CF4
-Route127_Tileset:: @ 8286CF4
-Route128_Tileset:: @ 8286CF4
-Route129_Tileset:: @ 8286CF4
-Route130_Tileset:: @ 8286CF4
-Route131_Tileset:: @ 8286CF4
-Route132_Tileset:: @ 8286CF4
-Route133_Tileset:: @ 8286CF4
-Route134_Tileset:: @ 8286CF4
-RustboroCity_DevonCorp_1F_Tileset:: @ 8286CF4
-RustboroCity_DevonCorp_2F_Tileset:: @ 8286CF4
-RustboroCity_DevonCorp_3F_Tileset:: @ 8286CF4
-RustboroCity_Tileset:: @ 8286CF4
-RusturfTunnel_Tileset:: @ 8286CF4
-SSTidalCorridor_Tileset:: @ 8286CF4
-SSTidalLowerDeck_Tileset:: @ 8286CF4
-SSTidalRooms_Tileset:: @ 8286CF4
-SafariZone_Northeast_Tileset:: @ 8286CF4
-SafariZone_Northwest_Tileset:: @ 8286CF4
-SafariZone_Southeast_Tileset:: @ 8286CF4
-SafariZone_Southwest_Tileset:: @ 8286CF4
-ScorchedSlab_Tileset:: @ 8286CF4
-SeafloorCavern_Entrance_Tileset:: @ 8286CF4
-SeafloorCavern_Room1_Tileset:: @ 8286CF4
-SeafloorCavern_Room2_Tileset:: @ 8286CF4
-SeafloorCavern_Room3_Tileset:: @ 8286CF4
-SeafloorCavern_Room4_Tileset:: @ 8286CF4
-SeafloorCavern_Room5_Tileset:: @ 8286CF4
-SeafloorCavern_Room6_Tileset:: @ 8286CF4
-SeafloorCavern_Room7_Tileset:: @ 8286CF4
-SeafloorCavern_Room8_Tileset:: @ 8286CF4
-SeafloorCavern_Room9_Tileset:: @ 8286CF4
-SealedChamber_InnerRoom_Tileset:: @ 8286CF4
-SealedChamber_OuterRoom_Tileset:: @ 8286CF4
-ShoalCave_HighTideEntranceRoom_Tileset:: @ 8286CF4
-ShoalCave_HighTideInnerRoom_Tileset:: @ 8286CF4
-ShoalCave_LowTideEntranceRoom_Tileset:: @ 8286CF4
-ShoalCave_LowTideIceRoom_Tileset:: @ 8286CF4
-ShoalCave_LowTideInnerRoom_Tileset:: @ 8286CF4
-ShoalCave_LowTideLowerRoom_Tileset:: @ 8286CF4
-ShoalCave_LowTideStairsRoom_Tileset:: @ 8286CF4
-SkyPillar_1F_Tileset:: @ 8286CF4
-SkyPillar_2F_Tileset:: @ 8286CF4
-SkyPillar_3F_Tileset:: @ 8286CF4
-SkyPillar_4F_Tileset:: @ 8286CF4
-SkyPillar_5F_Tileset:: @ 8286CF4
-SkyPillar_Entrance_Tileset:: @ 8286CF4
-SkyPillar_Outside_Tileset:: @ 8286CF4
-SkyPillar_Top_Tileset:: @ 8286CF4
-SlateportCity_Harbor_Tileset:: @ 8286CF4
-SlateportCity_SternsShipyard_1F_Tileset:: @ 8286CF4
-SlateportCity_SternsShipyard_2F_Tileset:: @ 8286CF4
-SlateportCity_Tileset:: @ 8286CF4
-SootopolisCity_Tileset:: @ 8286CF4
-SouthernIsland_Exterior_Tileset:: @ 8286CF4
-SouthernIsland_Interior_Tileset:: @ 8286CF4
-Underwater1_Tileset:: @ 8286CF4
-Underwater2_Tileset:: @ 8286CF4
-Underwater3_Tileset:: @ 8286CF4
-Underwater4_Tileset:: @ 8286CF4
-Underwater_Route134_Tileset:: @ 8286CF4
-Underwater_SeafloorCavern_Tileset:: @ 8286CF4
-Underwater_SealedChamber_Tileset:: @ 8286CF4
-Underwater_SootopolisCity_Tileset:: @ 8286CF4
-VerdanturfTown_Tileset:: @ 8286CF4
-VictoryRoad_1F_Tileset:: @ 8286CF4
-VictoryRoad_B1F_Tileset:: @ 8286CF4
-VictoryRoad_B2F_Tileset:: @ 8286CF4
-	.byte 1
-	.byte 0
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_General
-	.4byte gTilesetPalettes_General
-	.4byte gMetatiles_General
-	.4byte gMetatileAttributes_General
-	.4byte TilesetCB_General
-
-LittlerootTown_Tileset2:: @ 8286D0C
-OldaleTown_Tileset2:: @ 8286D0C
-PetalburgCity_Tileset2:: @ 8286D0C
-Route101_Tileset2:: @ 8286D0C
-Route102_Tileset2:: @ 8286D0C
-Route103_Tileset2:: @ 8286D0C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Petalburg
-	.4byte gTilesetPalettes_Petalburg
-	.4byte gMetatiles_Petalburg
-	.4byte gMetatileAttributes_Petalburg
-	.4byte TilesetCB_Petalburg
-
-PetalburgWoods_Tileset2:: @ 8286D24
-Route104_Prototype_Tileset2:: @ 8286D24
-Route104_Tileset2:: @ 8286D24
-Route116_Tileset2:: @ 8286D24
-RustboroCity_Tileset2:: @ 8286D24
-SouthernIsland_Exterior_Tileset2:: @ 8286D24
-SouthernIsland_Interior_Tileset2:: @ 8286D24
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Rustboro
-	.4byte gTilesetPalettes_Rustboro
-	.4byte gMetatiles_Rustboro
-	.4byte gMetatileAttributes_Rustboro
-	.4byte TilesetCB_Rustboro
-
-BattleTower_Outside_Tileset2:: @ 8286D3C
-DewfordTown_Tileset2:: @ 8286D3C
-Route105_Tileset2:: @ 8286D3C
-Route106_Tileset2:: @ 8286D3C
-Route107_Tileset2:: @ 8286D3C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Dewford
-	.4byte gTilesetPalettes_Dewford
-	.4byte gMetatiles_Dewford
-	.4byte gMetatileAttributes_Dewford
-	.4byte TilesetCB_Dewford
-
-Route108_Tileset2:: @ 8286D54
-Route109_Tileset2:: @ 8286D54
-SlateportCity_Tileset2:: @ 8286D54
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Slateport
-	.4byte gTilesetPalettes_Slateport
-	.4byte gMetatiles_Slateport
-	.4byte gMetatileAttributes_Slateport
-	.4byte TilesetCB_Slateport
-
-MauvilleCity_Tileset2:: @ 8286D6C
-Route110_Tileset2:: @ 8286D6C
-Route111_Tileset2:: @ 8286D6C
-Route117_Tileset2:: @ 8286D6C
-Route118_Tileset2:: @ 8286D6C
-VerdanturfTown_Tileset2:: @ 8286D6C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Mauville
-	.4byte gTilesetPalettes_Mauville
-	.4byte gMetatiles_Mauville
-	.4byte gMetatileAttributes_Mauville
-	.4byte TilesetCB_Mauville
-
-FieryPath_Tileset2:: @ 8286D84
-JaggedPass_Tileset2:: @ 8286D84
-LavaridgeTown_Tileset2:: @ 8286D84
-MtChimney_Tileset2:: @ 8286D84
-Route112_Tileset2:: @ 8286D84
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Lavaridge
-	.4byte gTilesetPalettes_Lavaridge
-	.4byte gMetatiles_Lavaridge
-	.4byte gMetatileAttributes_Lavaridge
-	.4byte TilesetCB_Lavaridge
-
-FallarborTown_Tileset2:: @ 8286D9C
-Route113_Tileset2:: @ 8286D9C
-Route114_FossilManiacsTunnel_Tileset2:: @ 8286D9C
-Route114_Tileset2:: @ 8286D9C
-Route115_Tileset2:: @ 8286D9C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Fallarbor
-	.4byte gTilesetPalettes_Fallarbor
-	.4byte gMetatiles_Fallarbor
-	.4byte gMetatileAttributes_Fallarbor
-	.4byte TilesetCB_Fallarbor
-
-FortreeCity_Tileset2:: @ 8286DB4
-Route119_Tileset2:: @ 8286DB4
-Route120_Tileset2:: @ 8286DB4
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Fortree
-	.4byte gTilesetPalettes_Fortree
-	.4byte gMetatiles_Fortree
-	.4byte gMetatileAttributes_Fortree
-	.4byte TilesetCB_Fortree
-
-LilycoveCity_Tileset2:: @ 8286DCC
-Route121_Tileset2:: @ 8286DCC
-Route122_Tileset2:: @ 8286DCC
-Route123_Tileset2:: @ 8286DCC
-SafariZone_Northeast_Tileset2:: @ 8286DCC
-SafariZone_Northwest_Tileset2:: @ 8286DCC
-SafariZone_Southeast_Tileset2:: @ 8286DCC
-SafariZone_Southwest_Tileset2:: @ 8286DCC
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Lilycove
-	.4byte gTilesetPalettes_Lilycove
-	.4byte gMetatiles_Lilycove
-	.4byte gMetatileAttributes_Lilycove
-	.4byte TilesetCB_Lilycove
-
-MossdeepCity_Tileset2:: @ 8286DE4
-Route124_Tileset2:: @ 8286DE4
-Route125_Tileset2:: @ 8286DE4
-Route126_Tileset2:: @ 8286DE4
-Route127_Tileset2:: @ 8286DE4
-Route128_Tileset2:: @ 8286DE4
-Route129_Tileset2:: @ 8286DE4
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Mossdeep
-	.4byte gTilesetPalettes_Mossdeep
-	.4byte gMetatiles_Mossdeep
-	.4byte gMetatileAttributes_Mossdeep
-	.4byte TilesetCB_Mossdeep
-
-EverGrandeCity_Tileset2:: @ 8286DFC
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_EverGrande
-	.4byte gTilesetPalettes_EverGrande
-	.4byte gMetatiles_EverGrande
-	.4byte gMetatileAttributes_EverGrande
-	.4byte TilesetCB_EverGrande
-
-PacifidlogTown_Tileset2:: @ 8286E14
-Route131_Tileset2:: @ 8286E14
-Route132_Tileset2:: @ 8286E14
-Route133_Tileset2:: @ 8286E14
-Route134_Tileset2:: @ 8286E14
-SeafloorCavern_Room6_Tileset2:: @ 8286E14
-SeafloorCavern_Room7_Tileset2:: @ 8286E14
-SkyPillar_1F_Tileset2:: @ 8286E14
-SkyPillar_2F_Tileset2:: @ 8286E14
-SkyPillar_3F_Tileset2:: @ 8286E14
-SkyPillar_4F_Tileset2:: @ 8286E14
-SkyPillar_5F_Tileset2:: @ 8286E14
-SkyPillar_Outside_Tileset2:: @ 8286E14
-SkyPillar_Top_Tileset2:: @ 8286E14
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Pacifidlog
-	.4byte gTilesetPalettes_Pacifidlog
-	.4byte gMetatiles_Pacifidlog
-	.4byte gMetatileAttributes_Pacifidlog
-	.4byte TilesetCB_Pacifidlog
-
-SootopolisCity_Tileset2:: @ 8286E2C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Sootopolis
-	.4byte gTilesetPalettes_Sootopolis
-	.4byte gMetatiles_Sootopolis
-	.4byte gMetatileAttributes_Sootopolis
-	.4byte TilesetCB_Sootopolis
-
-BattleTower_BattleRoom_Tileset:: @ 8286E44
-BattleTower_Corridor_Tileset:: @ 8286E44
-BattleTower_Elevator_Tileset:: @ 8286E44
-BattleTower_Lobby_Tileset:: @ 8286E44
-DewfordTown_Gym_Tileset:: @ 8286E44
-DewfordTown_Hall_Tileset:: @ 8286E44
-DewfordTown_House1_Tileset:: @ 8286E44
-DewfordTown_House2_Tileset:: @ 8286E44
-DoubleBattleColosseum_Tileset:: @ 8286E44
-EverGrandeCity_ChampionsRoom_Tileset:: @ 8286E44
-EverGrandeCity_Corridor1_Tileset:: @ 8286E44
-EverGrandeCity_Corridor4_Tileset:: @ 8286E44
-EverGrandeCity_DrakesRoom_Tileset:: @ 8286E44
-EverGrandeCity_GlaciasRoom_Tileset:: @ 8286E44
-EverGrandeCity_HallOfFame_Tileset:: @ 8286E44
-EverGrandeCity_PhoebesRoom_Tileset:: @ 8286E44
-EverGrandeCity_PokemonLeague_Tileset:: @ 8286E44
-EverGrandeCity_SidneysRoom_Tileset:: @ 8286E44
-FallarborTown_ContestHall_Tileset:: @ 8286E44
-FallarborTown_ContestLobby_Tileset:: @ 8286E44
-FortreeCity_DecorationShop_Tileset:: @ 8286E44
-FortreeCity_Gym_Tileset:: @ 8286E44
-FortreeCity_House1_Tileset:: @ 8286E44
-FortreeCity_House2_Tileset:: @ 8286E44
-LavaridgeTown_Gym_1F_Tileset:: @ 8286E44
-LavaridgeTown_Gym_B1F_Tileset:: @ 8286E44
-LavaridgeTown_HerbShop_Tileset:: @ 8286E44
-LavaridgeTown_PokemonCenter_1F_Tileset:: @ 8286E44
-LilycoveCity_ContestHall_Tileset:: @ 8286E44
-LilycoveCity_ContestLobby_Tileset:: @ 8286E44
-LilycoveCity_CoveLilyMotel_1F_Tileset:: @ 8286E44
-LilycoveCity_CoveLilyMotel_2F_Tileset:: @ 8286E44
-LilycoveCity_DepartmentStoreElevator_Tileset:: @ 8286E44
-LilycoveCity_DepartmentStoreRooftop_Tileset:: @ 8286E44
-LilycoveCity_DepartmentStore_1F_Tileset:: @ 8286E44
-LilycoveCity_DepartmentStore_2F_Tileset:: @ 8286E44
-LilycoveCity_DepartmentStore_3F_Tileset:: @ 8286E44
-LilycoveCity_DepartmentStore_4F_Tileset:: @ 8286E44
-LilycoveCity_DepartmentStore_5F_Tileset:: @ 8286E44
-LilycoveCity_House2_Tileset:: @ 8286E44
-LilycoveCity_LilycoveMuseum_1F_Tileset:: @ 8286E44
-LilycoveCity_LilycoveMuseum_2F_Tileset:: @ 8286E44
-LilycoveCity_PokemonTrainerFanClub_Tileset:: @ 8286E44
-LittlerootTown_BrendansHouse_1F_Tileset:: @ 8286E44
-LittlerootTown_BrendansHouse_2F_Tileset:: @ 8286E44
-LittlerootTown_MaysHouse_1F_Tileset:: @ 8286E44
-LittlerootTown_MaysHouse_2F_Tileset:: @ 8286E44
-LittlerootTown_ProfessorBirchsLab_Tileset:: @ 8286E44
-MauvilleCity_GameCorner_Tileset:: @ 8286E44
-MauvilleCity_Gym_Tileset:: @ 8286E44
-MossdeepCity_GameCorner_1F_Tileset:: @ 8286E44
-MossdeepCity_GameCorner_B1F_Tileset:: @ 8286E44
-MossdeepCity_Gym_Tileset:: @ 8286E44
-MossdeepCity_StevensHouse_Tileset:: @ 8286E44
-OldaleTown_House1_Tileset:: @ 8286E44
-OldaleTown_House2_Tileset:: @ 8286E44
-OldaleTown_Mart_Tileset:: @ 8286E44
-OldaleTown_PokemonCenter_1F_Tileset:: @ 8286E44
-OldaleTown_PokemonCenter_2F_Tileset:: @ 8286E44
-PacifidlogTown_House1_Tileset:: @ 8286E44
-PacifidlogTown_House2_Tileset:: @ 8286E44
-PetalburgCity_Gym_Tileset:: @ 8286E44
-PetalburgCity_House2_Tileset:: @ 8286E44
-RecordCorner_Tileset:: @ 8286E44
-Route104_MrBrineysHouse_Tileset:: @ 8286E44
-Route104_PrettyPetalFlowerShop_Tileset:: @ 8286E44
-Route109_SeashoreHouse_Tileset:: @ 8286E44
-Route110_SeasideCyclingRoadSouthEntrance_Tileset:: @ 8286E44
-Route110_TrickHouseCorridor_Tileset:: @ 8286E44
-Route110_TrickHouseEnd_Tileset:: @ 8286E44
-Route110_TrickHouseEntrance_Tileset:: @ 8286E44
-Route110_TrickHousePuzzle1_Tileset:: @ 8286E44
-Route110_TrickHousePuzzle2_Tileset:: @ 8286E44
-Route110_TrickHousePuzzle3_Tileset:: @ 8286E44
-Route110_TrickHousePuzzle4_Tileset:: @ 8286E44
-Route110_TrickHousePuzzle5_Tileset:: @ 8286E44
-Route110_TrickHousePuzzle6_Tileset:: @ 8286E44
-Route110_TrickHousePuzzle7_Tileset:: @ 8286E44
-Route110_TrickHousePuzzle8_Tileset:: @ 8286E44
-Route114_FossilManiacsHouse_Tileset:: @ 8286E44
-Route114_LanettesHouse_Tileset:: @ 8286E44
-Route116_TunnelersRestHouse_Tileset:: @ 8286E44
-Route117_PokemonDayCare_Tileset:: @ 8286E44
-Route119_WeatherInstitute_1F_Tileset:: @ 8286E44
-Route119_WeatherInstitute_2F_Tileset:: @ 8286E44
-Route121_SafariZoneEntrance_Tileset:: @ 8286E44
-Route124_DivingTreasureHuntersHouse_Tileset:: @ 8286E44
-RustboroCity_CuttersHouse_Tileset:: @ 8286E44
-RustboroCity_Flat1_1F_Tileset:: @ 8286E44
-RustboroCity_Flat1_2F_Tileset:: @ 8286E44
-RustboroCity_Flat2_1F_Tileset:: @ 8286E44
-RustboroCity_Flat2_2F_Tileset:: @ 8286E44
-RustboroCity_Flat2_3F_Tileset:: @ 8286E44
-RustboroCity_Gym_Tileset:: @ 8286E44
-RustboroCity_House1_Tileset:: @ 8286E44
-RustboroCity_House2_Tileset:: @ 8286E44
-RustboroCity_PokemonSchool_Tileset:: @ 8286E44
-SafariZone_RestHouse_Tileset:: @ 8286E44
-SingleBattleColosseum_Tileset:: @ 8286E44
-SlateportCity_OceanicMuseum_1F_Tileset:: @ 8286E44
-SlateportCity_OceanicMuseum_2F_Tileset:: @ 8286E44
-SlateportCity_PokemonFanClub_Tileset:: @ 8286E44
-SootopolisCity_Gym_1F_Tileset:: @ 8286E44
-SootopolisCity_Gym_B1F_Tileset:: @ 8286E44
-SootopolisCity_House1_Tileset:: @ 8286E44
-SootopolisCity_House2_Tileset:: @ 8286E44
-SootopolisCity_House3_Tileset:: @ 8286E44
-SootopolisCity_House8_Tileset:: @ 8286E44
-TradeCenter_Tileset:: @ 8286E44
-UnknownMap_25_29_Tileset:: @ 8286E44
-UnknownMap_25_30_Tileset:: @ 8286E44
-UnknownMap_25_31_Tileset:: @ 8286E44
-UnknownMap_25_32_Tileset:: @ 8286E44
-UnknownMap_25_33_Tileset:: @ 8286E44
-UnknownMap_25_34_Tileset:: @ 8286E44
-VerdanturfTown_WandasHouse_Tileset:: @ 8286E44
-	.byte 1
-	.byte 0
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Building
-	.4byte gTilesetPalettes_Building
-	.4byte gMetatiles_Building
-	.4byte gMetatileAttributes_Building
-	.4byte TilesetCB_Building
-
-LavaridgeTown_HerbShop_Tileset2:: @ 8286E5C
-LilycoveCity_DepartmentStoreRooftop_Tileset2:: @ 8286E5C
-LilycoveCity_DepartmentStore_1F_Tileset2:: @ 8286E5C
-LilycoveCity_DepartmentStore_2F_Tileset2:: @ 8286E5C
-LilycoveCity_DepartmentStore_3F_Tileset2:: @ 8286E5C
-LilycoveCity_DepartmentStore_4F_Tileset2:: @ 8286E5C
-LilycoveCity_DepartmentStore_5F_Tileset2:: @ 8286E5C
-OldaleTown_Mart_Tileset2:: @ 8286E5C
-Route110_SeasideCyclingRoadSouthEntrance_Tileset2:: @ 8286E5C
-Route121_SafariZoneEntrance_Tileset2:: @ 8286E5C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Shop
-	.4byte gTilesetPalettes_Shop
-	.4byte gMetatiles_Shop
-	.4byte gMetatileAttributes_Shop
-	.4byte 0x0
-
-EverGrandeCity_PokemonLeague_Tileset2:: @ 8286E74
-LavaridgeTown_PokemonCenter_1F_Tileset2:: @ 8286E74
-OldaleTown_PokemonCenter_1F_Tileset2:: @ 8286E74
-OldaleTown_PokemonCenter_2F_Tileset2:: @ 8286E74
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_PokemonCenter
-	.4byte gTilesetPalettes_PokemonCenter
-	.4byte gMetatiles_PokemonCenter
-	.4byte gMetatileAttributes_PokemonCenter
-	.4byte 0x0
-
-AncientTomb_Tileset2:: @ 8286E8C
-CaveOfOrigin_1F_Tileset2:: @ 8286E8C
-CaveOfOrigin_B1F_Tileset2:: @ 8286E8C
-CaveOfOrigin_B2F_Tileset2:: @ 8286E8C
-CaveOfOrigin_B3F_Tileset2:: @ 8286E8C
-CaveOfOrigin_B4F_Tileset2:: @ 8286E8C
-CaveOfOrigin_Entrance_Tileset2:: @ 8286E8C
-DesertRuins_Tileset2:: @ 8286E8C
-GraniteCave_1F_Tileset2:: @ 8286E8C
-GraniteCave_B1F_Tileset2:: @ 8286E8C
-GraniteCave_B2F_Tileset2:: @ 8286E8C
-GraniteCave_StevensRoom_Tileset2:: @ 8286E8C
-IslandCave_Tileset2:: @ 8286E8C
-Route130_Tileset2:: @ 8286E8C
-ScorchedSlab_Tileset2:: @ 8286E8C
-SeafloorCavern_Entrance_Tileset2:: @ 8286E8C
-SeafloorCavern_Room1_Tileset2:: @ 8286E8C
-SeafloorCavern_Room2_Tileset2:: @ 8286E8C
-SeafloorCavern_Room3_Tileset2:: @ 8286E8C
-SeafloorCavern_Room4_Tileset2:: @ 8286E8C
-SeafloorCavern_Room5_Tileset2:: @ 8286E8C
-SeafloorCavern_Room8_Tileset2:: @ 8286E8C
-SeafloorCavern_Room9_Tileset2:: @ 8286E8C
-SealedChamber_InnerRoom_Tileset2:: @ 8286E8C
-SealedChamber_OuterRoom_Tileset2:: @ 8286E8C
-ShoalCave_HighTideEntranceRoom_Tileset2:: @ 8286E8C
-ShoalCave_HighTideInnerRoom_Tileset2:: @ 8286E8C
-ShoalCave_LowTideEntranceRoom_Tileset2:: @ 8286E8C
-ShoalCave_LowTideIceRoom_Tileset2:: @ 8286E8C
-ShoalCave_LowTideInnerRoom_Tileset2:: @ 8286E8C
-ShoalCave_LowTideLowerRoom_Tileset2:: @ 8286E8C
-ShoalCave_LowTideStairsRoom_Tileset2:: @ 8286E8C
-SkyPillar_Entrance_Tileset2:: @ 8286E8C
-VictoryRoad_1F_Tileset2:: @ 8286E8C
-VictoryRoad_B1F_Tileset2:: @ 8286E8C
-VictoryRoad_B2F_Tileset2:: @ 8286E8C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Cave
-	.4byte gTilesetPalettes_Cave
-	.4byte gMetatiles_Cave
-	.4byte gMetatileAttributes_Cave
-	.4byte TilesetCB_Cave
-
-RustboroCity_PokemonSchool_Tileset2:: @ 8286EA4
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_PokemonSchool
-	.4byte gTilesetPalettes_PokemonSchool
-	.4byte gMetatiles_PokemonSchool
-	.4byte gMetatileAttributes_PokemonSchool
-	.4byte 0x0
-
-SlateportCity_PokemonFanClub_Tileset2:: @ 8286EBC
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_PokemonFanClub
-	.4byte gTilesetPalettes_PokemonFanClub
-	.4byte gMetatiles_PokemonFanClub
-	.4byte gMetatileAttributes_PokemonFanClub
-	.4byte 0x0
-
-	.incbin "baserom.gba", 0x286ed4, 0x18
-
-MeteorFalls_1F_1R_Tileset2:: @ 8286EEC
-MeteorFalls_1F_2R_Tileset2:: @ 8286EEC
-MeteorFalls_B1F_1R_Tileset2:: @ 8286EEC
-MeteorFalls_B1F_2R_Tileset2:: @ 8286EEC
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_MeteorFalls
-	.4byte gTilesetPalettes_MeteorFalls
-	.4byte gMetatiles_MeteorFalls
-	.4byte gMetatileAttributes_MeteorFalls
-	.4byte 0x0
-
-SlateportCity_OceanicMuseum_1F_Tileset2:: @ 8286F04
-SlateportCity_OceanicMuseum_2F_Tileset2:: @ 8286F04
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_OceanicMuseum
-	.4byte gTilesetPalettes_OceanicMuseum
-	.4byte gMetatiles_OceanicMuseum
-	.4byte gMetatileAttributes_OceanicMuseum
-	.4byte 0x0
-
-DoubleBattleColosseum_Tileset2:: @ 8286F1C
-EverGrandeCity_HallOfFame_Tileset2:: @ 8286F1C
-RecordCorner_Tileset2:: @ 8286F1C
-SingleBattleColosseum_Tileset2:: @ 8286F1C
-TradeCenter_Tileset2:: @ 8286F1C
-	.byte 0
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_CableClub
-	.4byte gTilesetPalettes_CableClub
-	.4byte gMetatiles_CableClub
-	.4byte gMetatileAttributes_CableClub
-	.4byte 0x0
-
-Route109_SeashoreHouse_Tileset2:: @ 8286F34
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_SeashoreHouse
-	.4byte gTilesetPalettes_SeashoreHouse
-	.4byte gMetatiles_SeashoreHouse
-	.4byte gMetatileAttributes_SeashoreHouse
-	.4byte 0x0
-
-Route104_PrettyPetalFlowerShop_Tileset2:: @ 8286F4C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_PrettyPetalFlowerShop
-	.4byte gTilesetPalettes_PrettyPetalFlowerShop
-	.4byte gMetatiles_PrettyPetalFlowerShop
-	.4byte gMetatileAttributes_PrettyPetalFlowerShop
-	.4byte 0x0
-
-Route117_PokemonDayCare_Tileset2:: @ 8286F64
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_PokemonDayCare
-	.4byte gTilesetPalettes_PokemonDayCare
-	.4byte gMetatiles_PokemonDayCare
-	.4byte gMetatileAttributes_PokemonDayCare
-	.4byte 0x0
-
-AbandonedShip_CaptainsOffice_Tileset2:: @ 8286F7C
-AbandonedShip_Deck_Tileset2:: @ 8286F7C
-AquaHideout_1F_Tileset2:: @ 8286F7C
-AquaHideout_B1F_Tileset2:: @ 8286F7C
-AquaHideout_B2F_Tileset2:: @ 8286F7C
-LilycoveCity_EmptyMap_Tileset2:: @ 8286F7C
-MagmaHideout_1F_Tileset2:: @ 8286F7C
-MagmaHideout_B1F_Tileset2:: @ 8286F7C
-MagmaHideout_B2F_Tileset2:: @ 8286F7C
-MossdeepCity_SpaceCenter_1F_Tileset2:: @ 8286F7C
-MossdeepCity_SpaceCenter_2F_Tileset2:: @ 8286F7C
-MtPyre_1F_Tileset2:: @ 8286F7C
-MtPyre_2F_Tileset2:: @ 8286F7C
-MtPyre_3F_Tileset2:: @ 8286F7C
-MtPyre_4F_Tileset2:: @ 8286F7C
-MtPyre_5F_Tileset2:: @ 8286F7C
-MtPyre_6F_Tileset2:: @ 8286F7C
-MtPyre_Exterior_Tileset2:: @ 8286F7C
-MtPyre_Summit_Tileset2:: @ 8286F7C
-NewMauville_Entrance_Tileset2:: @ 8286F7C
-Route112_CableCarStation_Tileset2:: @ 8286F7C
-RustboroCity_DevonCorp_1F_Tileset2:: @ 8286F7C
-RustboroCity_DevonCorp_2F_Tileset2:: @ 8286F7C
-RustboroCity_DevonCorp_3F_Tileset2:: @ 8286F7C
-SlateportCity_Harbor_Tileset2:: @ 8286F7C
-SlateportCity_SternsShipyard_1F_Tileset2:: @ 8286F7C
-SlateportCity_SternsShipyard_2F_Tileset2:: @ 8286F7C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Facility
-	.4byte gTilesetPalettes_Facility
-	.4byte gMetatiles_Facility
-	.4byte gMetatileAttributes_Facility
-	.4byte 0x0
-
-MauvilleCity_BikeShop_Tileset2:: @ 8286F94
-NewMauville_Inside_Tileset2:: @ 8286F94
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_BikeShop
-	.4byte gTilesetPalettes_BikeShop
-	.4byte gMetatiles_BikeShop
-	.4byte gMetatileAttributes_BikeShop
-	.4byte TilesetCB_BikeShop
-
-RusturfTunnel_Tileset2:: @ 8286FAC
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_RusturfTunnel
-	.4byte gTilesetPalettes_RusturfTunnel
-	.4byte gMetatiles_RusturfTunnel
-	.4byte gMetatileAttributes_RusturfTunnel
-	.4byte 0x0
-
-SecretBase_BrownCave1_Tileset2:: @ 8286FC4
-SecretBase_BrownCave2_Tileset2:: @ 8286FC4
-SecretBase_BrownCave3_Tileset2:: @ 8286FC4
-SecretBase_BrownCave4_Tileset2:: @ 8286FC4
-	.byte 0
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_SecretBaseBrownCave
-	.4byte gTilesetPalettes_SecretBaseBrownCave
-	.4byte gMetatiles_SecretBaseSecondary
-	.4byte gMetatileAttributes_SecretBaseSecondary
-	.4byte 0x0
-
-SecretBase_Tree1_Tileset2:: @ 8286FDC
-SecretBase_Tree2_Tileset2:: @ 8286FDC
-SecretBase_Tree3_Tileset2:: @ 8286FDC
-SecretBase_Tree4_Tileset2:: @ 8286FDC
-	.byte 0
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_SecretBaseTree
-	.4byte gTilesetPalettes_SecretBaseTree
-	.4byte gMetatiles_SecretBaseSecondary
-	.4byte gMetatileAttributes_SecretBaseSecondary
-	.4byte 0x0
-
-SecretBase_Shrub1_Tileset2:: @ 8286FF4
-SecretBase_Shrub2_Tileset2:: @ 8286FF4
-SecretBase_Shrub3_Tileset2:: @ 8286FF4
-SecretBase_Shrub4_Tileset2:: @ 8286FF4
-	.byte 0
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_SecretBaseShrub
-	.4byte gTilesetPalettes_SecretBaseShrub
-	.4byte gMetatiles_SecretBaseSecondary
-	.4byte gMetatileAttributes_SecretBaseSecondary
-	.4byte 0x0
-
-SecretBase_BlueCave1_Tileset2:: @ 828700C
-SecretBase_BlueCave2_Tileset2:: @ 828700C
-SecretBase_BlueCave3_Tileset2:: @ 828700C
-SecretBase_BlueCave4_Tileset2:: @ 828700C
-	.byte 0
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_SecretBaseBlueCave
-	.4byte gTilesetPalettes_SecretBaseBlueCave
-	.4byte gMetatiles_SecretBaseSecondary
-	.4byte gMetatileAttributes_SecretBaseSecondary
-	.4byte 0x0
-
-SecretBase_YellowCave1_Tileset2:: @ 8287024
-SecretBase_YellowCave2_Tileset2:: @ 8287024
-SecretBase_YellowCave3_Tileset2:: @ 8287024
-SecretBase_YellowCave4_Tileset2:: @ 8287024
-	.byte 0
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_SecretBaseYellowCave
-	.4byte gTilesetPalettes_SecretBaseYellowCave
-	.4byte gMetatiles_SecretBaseSecondary
-	.4byte gMetatileAttributes_SecretBaseSecondary
-	.4byte 0x0
-
-SecretBase_RedCave1_Tileset2:: @ 828703C
-SecretBase_RedCave2_Tileset2:: @ 828703C
-SecretBase_RedCave3_Tileset2:: @ 828703C
-SecretBase_RedCave4_Tileset2:: @ 828703C
-	.byte 0
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_SecretBaseRedCave
-	.4byte gTilesetPalettes_SecretBaseRedCave
-	.4byte gMetatiles_SecretBaseSecondary
-	.4byte gMetatileAttributes_SecretBaseSecondary
-	.4byte 0x0
-
-InsideOfTruck_Tileset2:: @ 8287054
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_InsideOfTruck
-	.4byte gTilesetPalettes_InsideOfTruck
-	.4byte gMetatiles_InsideOfTruck
-	.4byte gMetatileAttributes_InsideOfTruck
-	.4byte 0x0
-
-	.incbin "baserom.gba", 0x28706c, 0x18
-
-FallarborTown_ContestHall_Tileset2:: @ 8287084
-FallarborTown_ContestLobby_Tileset2:: @ 8287084
-LilycoveCity_ContestHall_Tileset2:: @ 8287084
-LilycoveCity_ContestLobby_Tileset2:: @ 8287084
-LinkContestRoom1_Tileset2:: @ 8287084
-LinkContestRoom2_Tileset2:: @ 8287084
-LinkContestRoom3_Tileset2:: @ 8287084
-LinkContestRoom4_Tileset2:: @ 8287084
-LinkContestRoom5_Tileset2:: @ 8287084
-LinkContestRoom6_Tileset2:: @ 8287084
-UnknownMap_25_29_Tileset2:: @ 8287084
-UnknownMap_25_30_Tileset2:: @ 8287084
-UnknownMap_25_31_Tileset2:: @ 8287084
-UnknownMap_25_32_Tileset2:: @ 8287084
-UnknownMap_25_33_Tileset2:: @ 8287084
-UnknownMap_25_34_Tileset2:: @ 8287084
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Contest
-	.4byte gTilesetPalettes_Contest
-	.4byte gMetatiles_Contest
-	.4byte gMetatileAttributes_Contest
-	.4byte 0x0
-
-LilycoveCity_LilycoveMuseum_1F_Tileset2:: @ 828709C
-LilycoveCity_LilycoveMuseum_2F_Tileset2:: @ 828709C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_LilycoveMuseum
-	.4byte gTilesetPalettes_LilycoveMuseum
-	.4byte gMetatiles_LilycoveMuseum
-	.4byte gMetatileAttributes_LilycoveMuseum
-	.4byte 0x0
-
-LittlerootTown_BrendansHouse_1F_Tileset2:: @ 82870B4
-LittlerootTown_BrendansHouse_2F_Tileset2:: @ 82870B4
-LittlerootTown_MaysHouse_1F_Tileset2:: @ 82870B4
-LittlerootTown_MaysHouse_2F_Tileset2:: @ 82870B4
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_BrendansMaysHouse
-	.4byte gTilesetPalettes_BrendansMaysHouse
-	.4byte gMetatiles_BrendansMaysHouse
-	.4byte gMetatileAttributes_BrendansMaysHouse
-	.4byte 0x0
-
-LittlerootTown_ProfessorBirchsLab_Tileset2:: @ 82870CC
-Route114_LanettesHouse_Tileset2:: @ 82870CC
-Route119_WeatherInstitute_1F_Tileset2:: @ 82870CC
-Route119_WeatherInstitute_2F_Tileset2:: @ 82870CC
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Lab
-	.4byte gTilesetPalettes_Lab
-	.4byte gMetatiles_Lab
-	.4byte gMetatileAttributes_Lab
-	.4byte 0x0
-
-Underwater1_Tileset2:: @ 82870E4
-Underwater2_Tileset2:: @ 82870E4
-Underwater3_Tileset2:: @ 82870E4
-Underwater4_Tileset2:: @ 82870E4
-Underwater_Route134_Tileset2:: @ 82870E4
-Underwater_SeafloorCavern_Tileset2:: @ 82870E4
-Underwater_SealedChamber_Tileset2:: @ 82870E4
-Underwater_SootopolisCity_Tileset2:: @ 82870E4
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Underwater
-	.4byte gTilesetPalettes_Underwater
-	.4byte gMetatiles_Underwater
-	.4byte gMetatileAttributes_Underwater
-	.4byte TilesetCB_Underwater
-
-PetalburgCity_Gym_Tileset2:: @ 82870FC
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_PetalburgGym
-	.4byte gTilesetPalettes_PetalburgGym
-	.4byte gMetatiles_PetalburgGym
-	.4byte gMetatileAttributes_PetalburgGym
-	.4byte 0x0
-
-SootopolisCity_Gym_1F_Tileset2:: @ 8287114
-SootopolisCity_Gym_B1F_Tileset2:: @ 8287114
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_SootopolisGym
-	.4byte gTilesetPalettes_SootopolisGym
-	.4byte gMetatiles_SootopolisGym
-	.4byte gMetatileAttributes_SootopolisGym
-	.4byte TilesetCB_SootopolisGym
-
-DewfordTown_Hall_Tileset2:: @ 828712C
-DewfordTown_House1_Tileset2:: @ 828712C
-DewfordTown_House2_Tileset2:: @ 828712C
-FortreeCity_DecorationShop_Tileset2:: @ 828712C
-FortreeCity_House1_Tileset2:: @ 828712C
-FortreeCity_House2_Tileset2:: @ 828712C
-LilycoveCity_CoveLilyMotel_1F_Tileset2:: @ 828712C
-LilycoveCity_CoveLilyMotel_2F_Tileset2:: @ 828712C
-LilycoveCity_House2_Tileset2:: @ 828712C
-LilycoveCity_PokemonTrainerFanClub_Tileset2:: @ 828712C
-MossdeepCity_GameCorner_1F_Tileset2:: @ 828712C
-MossdeepCity_GameCorner_B1F_Tileset2:: @ 828712C
-MossdeepCity_StevensHouse_Tileset2:: @ 828712C
-OldaleTown_House1_Tileset2:: @ 828712C
-OldaleTown_House2_Tileset2:: @ 828712C
-PacifidlogTown_House1_Tileset2:: @ 828712C
-PacifidlogTown_House2_Tileset2:: @ 828712C
-PetalburgCity_House2_Tileset2:: @ 828712C
-Route104_MrBrineysHouse_Tileset2:: @ 828712C
-Route110_TrickHouseCorridor_Tileset2:: @ 828712C
-Route110_TrickHouseEnd_Tileset2:: @ 828712C
-Route110_TrickHouseEntrance_Tileset2:: @ 828712C
-Route114_FossilManiacsHouse_Tileset2:: @ 828712C
-Route116_TunnelersRestHouse_Tileset2:: @ 828712C
-Route124_DivingTreasureHuntersHouse_Tileset2:: @ 828712C
-RustboroCity_CuttersHouse_Tileset2:: @ 828712C
-RustboroCity_Flat1_1F_Tileset2:: @ 828712C
-RustboroCity_Flat1_2F_Tileset2:: @ 828712C
-RustboroCity_Flat2_1F_Tileset2:: @ 828712C
-RustboroCity_Flat2_2F_Tileset2:: @ 828712C
-RustboroCity_Flat2_3F_Tileset2:: @ 828712C
-RustboroCity_House1_Tileset2:: @ 828712C
-RustboroCity_House2_Tileset2:: @ 828712C
-SafariZone_RestHouse_Tileset2:: @ 828712C
-SootopolisCity_House1_Tileset2:: @ 828712C
-SootopolisCity_House2_Tileset2:: @ 828712C
-SootopolisCity_House3_Tileset2:: @ 828712C
-SootopolisCity_House8_Tileset2:: @ 828712C
-VerdanturfTown_WandasHouse_Tileset2:: @ 828712C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_GenericBuilding
-	.4byte gTilesetPalettes_GenericBuilding
-	.4byte gMetatiles_GenericBuilding
-	.4byte gMetatileAttributes_GenericBuilding
-	.4byte 0x0
-
-MauvilleCity_GameCorner_Tileset2:: @ 8287144
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_MauvilleGameCorner
-	.4byte gTilesetPalettes_MauvilleGameCorner
-	.4byte gMetatiles_MauvilleGameCorner
-	.4byte gMetatileAttributes_MauvilleGameCorner
-	.4byte 0x0
-
-RustboroCity_Gym_Tileset2:: @ 828715C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_RustboroGym
-	.4byte gTilesetPalettes_RustboroGym
-	.4byte gMetatiles_RustboroGym
-	.4byte gMetatileAttributes_RustboroGym
-	.4byte 0x0
-
-DewfordTown_Gym_Tileset2:: @ 8287174
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_DewfordGym
-	.4byte gTilesetPalettes_DewfordGym
-	.4byte gMetatiles_DewfordGym
-	.4byte gMetatileAttributes_DewfordGym
-	.4byte 0x0
-
-MauvilleCity_Gym_Tileset2:: @ 828718C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_MauvilleGym
-	.4byte gTilesetPalettes_MauvilleGym
-	.4byte gMetatiles_MauvilleGym
-	.4byte gMetatileAttributes_MauvilleGym
-	.4byte TilesetCB_MauvilleGym
-
-LavaridgeTown_Gym_1F_Tileset2:: @ 82871A4
-LavaridgeTown_Gym_B1F_Tileset2:: @ 82871A4
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_LavaridgeGym
-	.4byte gTilesetPalettes_LavaridgeGym
-	.4byte gMetatiles_LavaridgeGym
-	.4byte gMetatileAttributes_LavaridgeGym
-	.4byte 0x0
-
-Route110_TrickHousePuzzle1_Tileset2:: @ 82871BC
-Route110_TrickHousePuzzle2_Tileset2:: @ 82871BC
-Route110_TrickHousePuzzle3_Tileset2:: @ 82871BC
-Route110_TrickHousePuzzle4_Tileset2:: @ 82871BC
-Route110_TrickHousePuzzle5_Tileset2:: @ 82871BC
-Route110_TrickHousePuzzle6_Tileset2:: @ 82871BC
-Route110_TrickHousePuzzle7_Tileset2:: @ 82871BC
-Route110_TrickHousePuzzle8_Tileset2:: @ 82871BC
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_TrickHousePuzzle
-	.4byte gTilesetPalettes_TrickHousePuzzle
-	.4byte gMetatiles_TrickHousePuzzle
-	.4byte gMetatileAttributes_TrickHousePuzzle
-	.4byte 0x0
-
-FortreeCity_Gym_Tileset2:: @ 82871D4
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_FortreeGym
-	.4byte gTilesetPalettes_FortreeGym
-	.4byte gMetatiles_FortreeGym
-	.4byte gMetatileAttributes_FortreeGym
-	.4byte 0x0
-
-MossdeepCity_Gym_Tileset2:: @ 82871EC
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_MossdeepGym
-	.4byte gTilesetPalettes_MossdeepGym
-	.4byte gMetatiles_MossdeepGym
-	.4byte gMetatileAttributes_MossdeepGym
-	.4byte 0x0
-
-AbandonedShip_Corridors_1F_Tileset2:: @ 8287204
-AbandonedShip_Corridors_B1F_Tileset2:: @ 8287204
-AbandonedShip_HiddenFloorCorridors_Tileset2:: @ 8287204
-AbandonedShip_HiddenFloorRooms_Tileset2:: @ 8287204
-AbandonedShip_Room_B1F_Tileset2:: @ 8287204
-AbandonedShip_Rooms2_1F_Tileset2:: @ 8287204
-AbandonedShip_Rooms2_B1F_Tileset2:: @ 8287204
-AbandonedShip_Rooms_1F_Tileset2:: @ 8287204
-AbandonedShip_Rooms_B1F_Tileset2:: @ 8287204
-AbandonedShip_Underwater1_Tileset2:: @ 8287204
-AbandonedShip_Underwater2_Tileset2:: @ 8287204
-SSTidalCorridor_Tileset2:: @ 8287204
-SSTidalLowerDeck_Tileset2:: @ 8287204
-SSTidalRooms_Tileset2:: @ 8287204
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_Ship
-	.4byte gTilesetPalettes_Ship
-	.4byte gMetatiles_Ship
-	.4byte gMetatileAttributes_Ship
-	.4byte 0x0
-
-SecretBase_BlueCave1_Tileset:: @ 828721C
-SecretBase_BlueCave2_Tileset:: @ 828721C
-SecretBase_BlueCave3_Tileset:: @ 828721C
-SecretBase_BlueCave4_Tileset:: @ 828721C
-SecretBase_BrownCave1_Tileset:: @ 828721C
-SecretBase_BrownCave2_Tileset:: @ 828721C
-SecretBase_BrownCave3_Tileset:: @ 828721C
-SecretBase_BrownCave4_Tileset:: @ 828721C
-SecretBase_RedCave1_Tileset:: @ 828721C
-SecretBase_RedCave2_Tileset:: @ 828721C
-SecretBase_RedCave3_Tileset:: @ 828721C
-SecretBase_RedCave4_Tileset:: @ 828721C
-SecretBase_Shrub1_Tileset:: @ 828721C
-SecretBase_Shrub2_Tileset:: @ 828721C
-SecretBase_Shrub3_Tileset:: @ 828721C
-SecretBase_Shrub4_Tileset:: @ 828721C
-SecretBase_Tree1_Tileset:: @ 828721C
-SecretBase_Tree2_Tileset:: @ 828721C
-SecretBase_Tree3_Tileset:: @ 828721C
-SecretBase_Tree4_Tileset:: @ 828721C
-SecretBase_YellowCave1_Tileset:: @ 828721C
-SecretBase_YellowCave2_Tileset:: @ 828721C
-SecretBase_YellowCave3_Tileset:: @ 828721C
-SecretBase_YellowCave4_Tileset:: @ 828721C
-	.byte 0
-	.byte 0
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_SecretBase
-	.4byte gTilesetPalettes_SecretBase
-	.4byte gMetatiles_SecretBasePrimary
-	.4byte gMetatileAttributes_SecretBasePrimary
-	.4byte 0x0
-
-EverGrandeCity_ChampionsRoom_Tileset2:: @ 8287234
-EverGrandeCity_Corridor1_Tileset2:: @ 8287234
-EverGrandeCity_Corridor4_Tileset2:: @ 8287234
-EverGrandeCity_DrakesRoom_Tileset2:: @ 8287234
-EverGrandeCity_GlaciasRoom_Tileset2:: @ 8287234
-EverGrandeCity_PhoebesRoom_Tileset2:: @ 8287234
-EverGrandeCity_SidneysRoom_Tileset2:: @ 8287234
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_EliteFour
-	.4byte gTilesetPalettes_EliteFour
-	.4byte gMetatiles_EliteFour
-	.4byte gMetatileAttributes_EliteFour
-	.4byte TilesetCB_EliteFour
-
-BattleTower_BattleRoom_Tileset2:: @ 828724C
-BattleTower_Corridor_Tileset2:: @ 828724C
-BattleTower_Elevator_Tileset2:: @ 828724C
-BattleTower_Lobby_Tileset2:: @ 828724C
-LilycoveCity_DepartmentStoreElevator_Tileset2:: @ 828724C
-	.byte 1
-	.byte 1
-	.byte 0
-	.byte 0
-	.4byte gTilesetTiles_BattleTower
-	.4byte gTilesetPalettes_BattleTower
-	.4byte gMetatiles_BattleTower
-	.4byte gMetatileAttributes_BattleTower
-	.4byte 0x0
+	.include "data/tilesets/headers.s"
 
 	.include "data/maps/_assets.s"
+
 	.global gUnknown_08304F18
 gUnknown_08304F18: @ 8304F18
-
 	.incbin "baserom.gba", 0x304f18, 0x530
 
 	.include "data/maps/PetalburgCity/header.s"
@@ -3587,10 +2405,10 @@ gUnknown_08304F18: @ 8304F18
 	.include "data/maps/Route119_House/header.s"
 	.include "data/maps/Route124_DivingTreasureHuntersHouse/header.s"
 	.include "data/maps/_groups.s"
-	.global gUnknown_08308588
-gUnknown_08308588: @ 8308588
 
 	.align 2
+	.global gUnknown_08308588
+gUnknown_08308588: @ 8308588
 gMapGroups:: @ 8308588
 	.4byte gMapGroup0
 	.4byte gMapGroup1
diff --git a/data/event_scripts.s b/data/event_scripts.s
index b597acc30..d90c5f0d3 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -39,344 +39,346 @@ gStdScripts::
 	.4byte Std_ObtainDecoration
 gStdScripts_End::
 
-	.include "data/maps/scripts/PetalburgCity.s"
-	.include "data/maps/scripts/SlateportCity.s"
-	.include "data/maps/scripts/MauvilleCity.s"
-	.include "data/maps/scripts/RustboroCity.s"
-	.include "data/maps/scripts/FortreeCity.s"
-	.include "data/maps/scripts/LilycoveCity.s"
-	.include "data/maps/scripts/MossdeepCity.s"
-	.include "data/maps/scripts/SootopolisCity.s"
-	.include "data/maps/scripts/EverGrandeCity.s"
-	.include "data/maps/scripts/LittlerootTown.s"
-	.include "data/maps/scripts/OldaleTown.s"
-	.include "data/maps/scripts/DewfordTown.s"
-	.include "data/maps/scripts/LavaridgeTown.s"
-	.include "data/maps/scripts/FallarborTown.s"
-	.include "data/maps/scripts/VerdanturfTown.s"
-	.include "data/maps/scripts/PacifidlogTown.s"
-	.include "data/maps/scripts/Route101.s"
-	.include "data/maps/scripts/Route102.s"
-	.include "data/maps/scripts/Route103.s"
-	.include "data/maps/scripts/Route104.s"
-	.include "data/maps/scripts/Route105.s"
-	.include "data/maps/scripts/Route106.s"
-	.include "data/maps/scripts/Route107.s"
-	.include "data/maps/scripts/Route108.s"
-	.include "data/maps/scripts/Route109.s"
-	.include "data/maps/scripts/Route110.s"
-	.include "data/maps/scripts/Route111.s"
-	.include "data/maps/scripts/Route112.s"
-	.include "data/maps/scripts/Route113.s"
-	.include "data/maps/scripts/Route114.s"
-	.include "data/maps/scripts/Route115.s"
-	.include "data/maps/scripts/Route116.s"
-	.include "data/maps/scripts/Route117.s"
-	.include "data/maps/scripts/Route118.s"
-	.include "data/maps/scripts/Route119.s"
-	.include "data/maps/scripts/Route120.s"
-	.include "data/maps/scripts/Route121.s"
-	.include "data/maps/scripts/Route122.s"
-	.include "data/maps/scripts/Route123.s"
-	.include "data/maps/scripts/Route124.s"
-	.include "data/maps/scripts/Route125.s"
-	.include "data/maps/scripts/Route126.s"
-	.include "data/maps/scripts/Route127.s"
-	.include "data/maps/scripts/Route128.s"
-	.include "data/maps/scripts/Route129.s"
-	.include "data/maps/scripts/Route130.s"
-	.include "data/maps/scripts/Route131.s"
-	.include "data/maps/scripts/Route132.s"
-	.include "data/maps/scripts/Route133.s"
-	.include "data/maps/scripts/Route134.s"
-	.include "data/maps/scripts/Underwater1.s"
-	.include "data/maps/scripts/Underwater2.s"
-	.include "data/maps/scripts/Underwater3.s"
-	.include "data/maps/scripts/Underwater4.s"
-	.include "data/maps/scripts/LittlerootTown_BrendansHouse_1F.s"
-	.include "data/maps/scripts/LittlerootTown_BrendansHouse_2F.s"
-	.include "data/maps/scripts/LittlerootTown_ProfessorBirchsLab.s"
-	.include "data/maps/scripts/OldaleTown_House1.s"
-	.include "data/maps/scripts/OldaleTown_House2.s"
-	.include "data/maps/scripts/OldaleTown_PokemonCenter_1F.s"
-	.include "data/maps/scripts/OldaleTown_PokemonCenter_2F.s"
-	.include "data/maps/scripts/OldaleTown_Mart.s"
-	.include "data/maps/scripts/DewfordTown_House1.s"
-	.include "data/maps/scripts/DewfordTown_PokemonCenter_1F.s"
-	.include "data/maps/scripts/DewfordTown_PokemonCenter_2F.s"
-	.include "data/maps/scripts/DewfordTown_Gym.s"
-	.include "data/maps/scripts/DewfordTown_Hall.s"
-	.include "data/maps/scripts/DewfordTown_House2.s"
-	.include "data/maps/scripts/LavaridgeTown_HerbShop.s"
-	.include "data/maps/scripts/LavaridgeTown_Gym_1F.s"
-	.include "data/maps/scripts/LavaridgeTown_Gym_B1F.s"
-	.include "data/maps/scripts/LavaridgeTown_House.s"
-	.include "data/maps/scripts/LavaridgeTown_Mart.s"
-	.include "data/maps/scripts/LavaridgeTown_PokemonCenter_1F.s"
-	.include "data/maps/scripts/LavaridgeTown_PokemonCenter_2F.s"
-	.include "data/maps/scripts/FallarborTown_Mart.s"
-	.include "data/maps/scripts/FallarborTown_ContestLobby.s"
-	.include "data/maps/scripts/FallarborTown_ContestHall.s"
-	.include "data/maps/scripts/FallarborTown_PokemonCenter_1F.s"
-	.include "data/maps/scripts/FallarborTown_PokemonCenter_2F.s"
-	.include "data/maps/scripts/FallarborTown_House1.s"
-	.include "data/maps/scripts/FallarborTown_House2.s"
-	.include "data/maps/scripts/VerdanturfTown_ContestLobby.s"
-	.include "data/maps/scripts/VerdanturfTown_ContestHall.s"
-	.include "data/maps/scripts/VerdanturfTown_Mart.s"
-	.include "data/maps/scripts/VerdanturfTown_PokemonCenter_1F.s"
-	.include "data/maps/scripts/VerdanturfTown_PokemonCenter_2F.s"
-	.include "data/maps/scripts/VerdanturfTown_WandasHouse.s"
-	.include "data/maps/scripts/VerdanturfTown_FriendshipRatersHouse.s"
-	.include "data/maps/scripts/VerdanturfTown_House.s"
-	.include "data/maps/scripts/PacifidlogTown_PokemonCenter_1F.s"
-	.include "data/maps/scripts/PacifidlogTown_PokemonCenter_2F.s"
-	.include "data/maps/scripts/PacifidlogTown_House1.s"
-	.include "data/maps/scripts/PacifidlogTown_House2.s"
-	.include "data/maps/scripts/PacifidlogTown_House3.s"
-	.include "data/maps/scripts/PacifidlogTown_House4.s"
-	.include "data/maps/scripts/PacifidlogTown_House5.s"
-	.include "data/maps/scripts/PetalburgCity_WallysHouse.s"
-	.include "data/maps/scripts/PetalburgCity_Gym.s"
-	.include "data/maps/scripts/PetalburgCity_House1.s"
-	.include "data/maps/scripts/PetalburgCity_House2.s"
-	.include "data/maps/scripts/PetalburgCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/PetalburgCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/PetalburgCity_Mart.s"
-	.include "data/maps/scripts/SlateportCity_SternsShipyard_1F.s"
-	.include "data/maps/scripts/SlateportCity_SternsShipyard_2F.s"
-	.include "data/maps/scripts/SlateportCity_ContestLobby.s"
-	.include "data/maps/scripts/SlateportCity_ContestHall.s"
-	.include "data/maps/scripts/SlateportCity_House1.s"
-	.include "data/maps/scripts/SlateportCity_PokemonFanClub.s"
-	.include "data/maps/scripts/SlateportCity_OceanicMuseum_1F.s"
-	.include "data/maps/scripts/SlateportCity_OceanicMuseum_2F.s"
-	.include "data/maps/scripts/SlateportCity_Harbor.s"
-	.include "data/maps/scripts/SlateportCity_House2.s"
-	.include "data/maps/scripts/SlateportCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/SlateportCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/SlateportCity_Mart.s"
-	.include "data/maps/scripts/MauvilleCity_Gym.s"
-	.include "data/maps/scripts/MauvilleCity_BikeShop.s"
-	.include "data/maps/scripts/MauvilleCity_House1.s"
-	.include "data/maps/scripts/MauvilleCity_GameCorner.s"
-	.include "data/maps/scripts/MauvilleCity_House2.s"
-	.include "data/maps/scripts/MauvilleCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/MauvilleCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/MauvilleCity_Mart.s"
-	.include "data/maps/scripts/RustboroCity_DevonCorp_1F.s"
-	.include "data/maps/scripts/RustboroCity_DevonCorp_2F.s"
-	.include "data/maps/scripts/RustboroCity_DevonCorp_3F.s"
-	.include "data/maps/scripts/RustboroCity_Gym.s"
-	.include "data/maps/scripts/RustboroCity_PokemonSchool.s"
-	.include "data/maps/scripts/RustboroCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/RustboroCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/RustboroCity_Mart.s"
-	.include "data/maps/scripts/RustboroCity_Flat1_1F.s"
-	.include "data/maps/scripts/RustboroCity_Flat1_2F.s"
-	.include "data/maps/scripts/RustboroCity_House1.s"
-	.include "data/maps/scripts/RustboroCity_CuttersHouse.s"
-	.include "data/maps/scripts/RustboroCity_House2.s"
-	.include "data/maps/scripts/RustboroCity_Flat2_1F.s"
-	.include "data/maps/scripts/RustboroCity_Flat2_2F.s"
-	.include "data/maps/scripts/RustboroCity_Flat2_3F.s"
-	.include "data/maps/scripts/RustboroCity_House3.s"
-	.include "data/maps/scripts/FortreeCity_House1.s"
-	.include "data/maps/scripts/FortreeCity_Gym.s"
-	.include "data/maps/scripts/FortreeCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/FortreeCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/FortreeCity_Mart.s"
-	.include "data/maps/scripts/FortreeCity_House2.s"
-	.include "data/maps/scripts/FortreeCity_House3.s"
-	.include "data/maps/scripts/FortreeCity_House4.s"
-	.include "data/maps/scripts/FortreeCity_House5.s"
-	.include "data/maps/scripts/FortreeCity_DecorationShop.s"
-	.include "data/maps/scripts/LilycoveCity_CoveLilyMotel_1F.s"
-	.include "data/maps/scripts/LilycoveCity_CoveLilyMotel_2F.s"
-	.include "data/maps/scripts/LilycoveCity_LilycoveMuseum_1F.s"
-	.include "data/maps/scripts/LilycoveCity_LilycoveMuseum_2F.s"
-	.include "data/maps/scripts/LilycoveCity_ContestLobby.s"
-	.include "data/maps/scripts/LilycoveCity_ContestHall.s"
-	.include "data/maps/scripts/LilycoveCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/LilycoveCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/LilycoveCity_UnusedMart.s"
-	.include "data/maps/scripts/LilycoveCity_PokemonTrainerFanClub.s"
-	.include "data/maps/scripts/LilycoveCity_Harbor.s"
-	.include "data/maps/scripts/LilycoveCity_EmptyMap.s"
-	.include "data/maps/scripts/LilycoveCity_MoveDeletersHouse.s"
-	.include "data/maps/scripts/LilycoveCity_House1.s"
-	.include "data/maps/scripts/LilycoveCity_House2.s"
-	.include "data/maps/scripts/LilycoveCity_House3.s"
-	.include "data/maps/scripts/LilycoveCity_House4.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStore_1F.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStore_2F.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStore_3F.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStore_4F.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStore_5F.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStoreRooftop.s"
-	.include "data/maps/scripts/LilycoveCity_DepartmentStoreElevator.s"
-	.include "data/maps/scripts/MossdeepCity_Gym.s"
-	.include "data/maps/scripts/MossdeepCity_House1.s"
-	.include "data/maps/scripts/MossdeepCity_House2.s"
-	.include "data/maps/scripts/MossdeepCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/MossdeepCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/MossdeepCity_Mart.s"
-	.include "data/maps/scripts/MossdeepCity_House3.s"
-	.include "data/maps/scripts/MossdeepCity_StevensHouse.s"
-	.include "data/maps/scripts/MossdeepCity_House4.s"
-	.include "data/maps/scripts/MossdeepCity_SpaceCenter_1F.s"
-	.include "data/maps/scripts/MossdeepCity_SpaceCenter_2F.s"
-	.include "data/maps/scripts/MossdeepCity_GameCorner_1F.s"
-	.include "data/maps/scripts/MossdeepCity_GameCorner_B1F.s"
-	.include "data/maps/scripts/SootopolisCity_Gym_1F.s"
-	.include "data/maps/scripts/SootopolisCity_Gym_B1F.s"
-	.include "data/maps/scripts/SootopolisCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/SootopolisCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/SootopolisCity_Mart.s"
-	.include "data/maps/scripts/SootopolisCity_House1.s"
-	.include "data/maps/scripts/SootopolisCity_House2.s"
-	.include "data/maps/scripts/SootopolisCity_House3.s"
-	.include "data/maps/scripts/SootopolisCity_House4.s"
-	.include "data/maps/scripts/SootopolisCity_House5.s"
-	.include "data/maps/scripts/SootopolisCity_House6.s"
-	.include "data/maps/scripts/SootopolisCity_House7.s"
-	.include "data/maps/scripts/SootopolisCity_House8.s"
-	.include "data/maps/scripts/EverGrandeCity_SidneysRoom.s"
-	.include "data/maps/scripts/EverGrandeCity_PhoebesRoom.s"
-	.include "data/maps/scripts/EverGrandeCity_GlaciasRoom.s"
-	.include "data/maps/scripts/EverGrandeCity_DrakesRoom.s"
-	.include "data/maps/scripts/EverGrandeCity_ChampionsRoom.s"
-	.include "data/maps/scripts/EverGrandeCity_Corridor1.s"
-	.include "data/maps/scripts/EverGrandeCity_Corridor2.s"
-	.include "data/maps/scripts/EverGrandeCity_Corridor3.s"
-	.include "data/maps/scripts/EverGrandeCity_Corridor4.s"
-	.include "data/maps/scripts/EverGrandeCity_Corridor5.s"
-	.include "data/maps/scripts/EverGrandeCity_PokemonLeague.s"
-	.include "data/maps/scripts/EverGrandeCity_HallOfFame.s"
-	.include "data/maps/scripts/EverGrandeCity_PokemonCenter_1F.s"
-	.include "data/maps/scripts/EverGrandeCity_PokemonCenter_2F.s"
-	.include "data/maps/scripts/Route104_MrBrineysHouse.s"
-	.include "data/maps/scripts/Route104_PrettyPetalFlowerShop.s"
-	.include "data/maps/scripts/Route111_WinstrateFamilysHouse.s"
-	.include "data/maps/scripts/Route111_OldLadysRestStop.s"
-	.include "data/maps/scripts/Route112_CableCarStation.s"
-	.include "data/maps/scripts/MtChimney_CableCarStation.s"
-	.include "data/maps/scripts/Route114_FossilManiacsHouse.s"
-	.include "data/maps/scripts/Route114_FossilManiacsTunnel.s"
-	.include "data/maps/scripts/Route114_LanettesHouse.s"
-	.include "data/maps/scripts/Route116_TunnelersRestHouse.s"
-	.include "data/maps/scripts/Route117_PokemonDayCare.s"
-	.include "data/maps/scripts/Route121_SafariZoneEntrance.s"
-	.include "data/maps/scripts/MeteorFalls_1F_1R.s"
-	.include "data/maps/scripts/MeteorFalls_1F_2R.s"
-	.include "data/maps/scripts/MeteorFalls_B1F_1R.s"
-	.include "data/maps/scripts/MeteorFalls_B1F_2R.s"
-	.include "data/maps/scripts/RusturfTunnel.s"
-	.include "data/maps/scripts/Underwater_SootopolisCity.s"
-	.include "data/maps/scripts/DesertRuins.s"
-	.include "data/maps/scripts/GraniteCave_1F.s"
-	.include "data/maps/scripts/GraniteCave_B1F.s"
-	.include "data/maps/scripts/GraniteCave_B2F.s"
-	.include "data/maps/scripts/GraniteCave_StevensRoom.s"
-	.include "data/maps/scripts/PetalburgWoods.s"
-	.include "data/maps/scripts/MtChimney.s"
-	.include "data/maps/scripts/JaggedPass.s"
-	.include "data/maps/scripts/FieryPath.s"
-	.include "data/maps/scripts/MtPyre_1F.s"
-	.include "data/maps/scripts/MtPyre_2F.s"
-	.include "data/maps/scripts/MtPyre_3F.s"
-	.include "data/maps/scripts/MtPyre_4F.s"
-	.include "data/maps/scripts/MtPyre_5F.s"
-	.include "data/maps/scripts/MtPyre_6F.s"
-	.include "data/maps/scripts/MtPyre_Exterior.s"
-	.include "data/maps/scripts/MtPyre_Summit.s"
-	.include "data/maps/scripts/AquaHideout_1F.s"
-	.include "data/maps/scripts/AquaHideout_B1F.s"
-	.include "data/maps/scripts/AquaHideout_B2F.s"
-	.include "data/maps/scripts/Underwater_SeafloorCavern.s"
-	.include "data/maps/scripts/SeafloorCavern_Entrance.s"
-	.include "data/maps/scripts/SeafloorCavern_Room1.s"
-	.include "data/maps/scripts/SeafloorCavern_Room2.s"
-	.include "data/maps/scripts/SeafloorCavern_Room3.s"
-	.include "data/maps/scripts/SeafloorCavern_Room4.s"
-	.include "data/maps/scripts/SeafloorCavern_Room5.s"
-	.include "data/maps/scripts/SeafloorCavern_Room6.s"
-	.include "data/maps/scripts/SeafloorCavern_Room7.s"
-	.include "data/maps/scripts/SeafloorCavern_Room8.s"
-	.include "data/maps/scripts/SeafloorCavern_Room9.s"
-	.include "data/maps/scripts/CaveOfOrigin_Entrance.s"
-	.include "data/maps/scripts/CaveOfOrigin_1F.s"
-	.include "data/maps/scripts/CaveOfOrigin_B1F.s"
-	.include "data/maps/scripts/CaveOfOrigin_B2F.s"
-	.include "data/maps/scripts/CaveOfOrigin_B3F.s"
-	.include "data/maps/scripts/CaveOfOrigin_B4F.s"
-	.include "data/maps/scripts/VictoryRoad_1F.s"
-	.include "data/maps/scripts/VictoryRoad_B1F.s"
-	.include "data/maps/scripts/VictoryRoad_B2F.s"
-	.include "data/maps/scripts/ShoalCave_LowTideEntranceRoom.s"
-	.include "data/maps/scripts/ShoalCave_LowTideInnerRoom.s"
-	.include "data/maps/scripts/ShoalCave_LowTideStairsRoom.s"
-	.include "data/maps/scripts/ShoalCave_LowTideLowerRoom.s"
-	.include "data/maps/scripts/ShoalCave_HighTideEntranceRoom.s"
-	.include "data/maps/scripts/ShoalCave_HighTideInnerRoom.s"
-	.include "data/maps/scripts/NewMauville_Entrance.s"
-	.include "data/maps/scripts/NewMauville_Inside.s"
-	.include "data/maps/scripts/AbandonedShip_Deck.s"
-	.include "data/maps/scripts/AbandonedShip_Corridors_1F.s"
-	.include "data/maps/scripts/AbandonedShip_Rooms_1F.s"
-	.include "data/maps/scripts/AbandonedShip_Corridors_B1F.s"
-	.include "data/maps/scripts/AbandonedShip_Rooms_B1F.s"
-	.include "data/maps/scripts/AbandonedShip_Rooms2_B1F.s"
-	.include "data/maps/scripts/AbandonedShip_Underwater1.s"
-	.include "data/maps/scripts/AbandonedShip_Room_B1F.s"
-	.include "data/maps/scripts/AbandonedShip_Rooms2_1F.s"
-	.include "data/maps/scripts/AbandonedShip_CaptainsOffice.s"
-	.include "data/maps/scripts/AbandonedShip_Underwater2.s"
-	.include "data/maps/scripts/AbandonedShip_HiddenFloorCorridors.s"
-	.include "data/maps/scripts/AbandonedShip_HiddenFloorRooms.s"
-	.include "data/maps/scripts/IslandCave.s"
-	.include "data/maps/scripts/AncientTomb.s"
-	.include "data/maps/scripts/Underwater_Route134.s"
-	.include "data/maps/scripts/Underwater_SealedChamber.s"
-	.include "data/maps/scripts/SealedChamber_OuterRoom.s"
-	.include "data/maps/scripts/SealedChamber_InnerRoom.s"
-	.include "data/maps/scripts/ScorchedSlab.s"
-	.include "data/maps/scripts/MagmaHideout_1F.s"
-	.include "data/maps/scripts/MagmaHideout_B1F.s"
-	.include "data/maps/scripts/MagmaHideout_B2F.s"
-	.include "data/maps/scripts/SkyPillar_Entrance.s"
-	.include "data/maps/scripts/SkyPillar_Outside.s"
-	.include "data/maps/scripts/SkyPillar_1F.s"
-	.include "data/maps/scripts/SkyPillar_2F.s"
-	.include "data/maps/scripts/SkyPillar_3F.s"
-	.include "data/maps/scripts/SkyPillar_4F.s"
-	.include "data/maps/scripts/ShoalCave_LowTideIceRoom.s"
-	.include "data/maps/scripts/SkyPillar_5F.s"
-	.include "data/maps/scripts/SkyPillar_Top.s"
-	.include "data/maps/scripts/SecretBase_BlueCave1.s"
-	.include "data/maps/scripts/SecretBase_BlueCave2.s"
-	.include "data/maps/scripts/SecretBase_BlueCave3.s"
-	.include "data/maps/scripts/SecretBase_BlueCave4.s"
-	.include "data/maps/scripts/SecretBase_BrownCave1.s"
-	.include "data/maps/scripts/SecretBase_BrownCave2.s"
-	.include "data/maps/scripts/SecretBase_BrownCave3.s"
-	.include "data/maps/scripts/SecretBase_BrownCave4.s"
-	.include "data/maps/scripts/SecretBase_RedCave1.s"
-	.include "data/maps/scripts/SecretBase_RedCave2.s"
-	.include "data/maps/scripts/SecretBase_RedCave3.s"
-	.include "data/maps/scripts/SecretBase_RedCave4.s"
-	.include "data/maps/scripts/SecretBase_Shrub1.s"
-	.include "data/maps/scripts/SecretBase_Shrub2.s"
-	.include "data/maps/scripts/SecretBase_Shrub3.s"
-	.include "data/maps/scripts/SecretBase_Shrub4.s"
-	.include "data/maps/scripts/SecretBase_Tree1.s"
-	.include "data/maps/scripts/SecretBase_Tree2.s"
-	.include "data/maps/scripts/SecretBase_Tree3.s"
-	.include "data/maps/scripts/SecretBase_Tree4.s"
-	.include "data/maps/scripts/SecretBase_YellowCave1.s"
-	.include "data/maps/scripts/SecretBase_YellowCave2.s"
-	.include "data/maps/scripts/SecretBase_YellowCave3.s"
-	.include "data/maps/scripts/SecretBase_YellowCave4.s"
+	.include "data/scripts/maps/PetalburgCity.s"
+	.include "data/scripts/maps/SlateportCity.s"
+	.include "data/scripts/maps/MauvilleCity.s"
+	.include "data/scripts/maps/RustboroCity.s"
+	.include "data/scripts/maps/FortreeCity.s"
+	.include "data/scripts/maps/LilycoveCity.s"
+	.include "data/scripts/maps/MossdeepCity.s"
+	.include "data/scripts/maps/SootopolisCity.s"
+	.include "data/scripts/maps/EverGrandeCity.s"
+	.include "data/scripts/maps/LittlerootTown.s"
+	.include "data/scripts/maps/OldaleTown.s"
+	.include "data/scripts/maps/DewfordTown.s"
+	.include "data/scripts/maps/LavaridgeTown.s"
+	.include "data/scripts/maps/FallarborTown.s"
+	.include "data/scripts/maps/VerdanturfTown.s"
+	.include "data/scripts/maps/PacifidlogTown.s"
+	.include "data/scripts/maps/Route101.s"
+	.include "data/scripts/maps/Route102.s"
+	.include "data/scripts/maps/Route103.s"
+	.include "data/scripts/maps/Route104.s"
+	.include "data/scripts/maps/Route105.s"
+	.include "data/scripts/maps/Route106.s"
+	.include "data/scripts/maps/Route107.s"
+	.include "data/scripts/maps/Route108.s"
+	.include "data/scripts/maps/Route109.s"
+	.include "data/scripts/maps/Route110.s"
+	.include "data/scripts/maps/Route111.s"
+	.include "data/scripts/maps/Route112.s"
+	.include "data/scripts/maps/Route113.s"
+	.include "data/scripts/maps/Route114.s"
+	.include "data/scripts/maps/Route115.s"
+	.include "data/scripts/maps/Route116.s"
+	.include "data/scripts/maps/Route117.s"
+	.include "data/scripts/maps/Route118.s"
+	.include "data/scripts/maps/Route119.s"
+	.include "data/scripts/maps/Route120.s"
+	.include "data/scripts/maps/Route121.s"
+	.include "data/scripts/maps/Route122.s"
+	.include "data/scripts/maps/Route123.s"
+	.include "data/scripts/maps/Route124.s"
+	.include "data/scripts/maps/Route125.s"
+	.include "data/scripts/maps/Route126.s"
+	.include "data/scripts/maps/Route127.s"
+	.include "data/scripts/maps/Route128.s"
+	.include "data/scripts/maps/Route129.s"
+	.include "data/scripts/maps/Route130.s"
+	.include "data/scripts/maps/Route131.s"
+	.include "data/scripts/maps/Route132.s"
+	.include "data/scripts/maps/Route133.s"
+	.include "data/scripts/maps/Route134.s"
+	.include "data/scripts/maps/Underwater1.s"
+	.include "data/scripts/maps/Underwater2.s"
+	.include "data/scripts/maps/Underwater3.s"
+	.include "data/scripts/maps/Underwater4.s"
+	.include "data/scripts/maps/LittlerootTown_BrendansHouse_1F.s"
+	.include "data/scripts/maps/LittlerootTown_BrendansHouse_2F.s"
+	.include "data/scripts/maps/LittlerootTown_MaysHouse_1F.s"
+	.include "data/scripts/maps/LittlerootTown_MaysHouse_2F.s"
+	.include "data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s"
+	.include "data/scripts/maps/OldaleTown_House1.s"
+	.include "data/scripts/maps/OldaleTown_House2.s"
+	.include "data/scripts/maps/OldaleTown_PokemonCenter_1F.s"
+	.include "data/scripts/maps/OldaleTown_PokemonCenter_2F.s"
+	.include "data/scripts/maps/OldaleTown_Mart.s"
+	.include "data/scripts/maps/DewfordTown_House1.s"
+	.include "data/scripts/maps/DewfordTown_PokemonCenter_1F.s"
+	.include "data/scripts/maps/DewfordTown_PokemonCenter_2F.s"
+	.include "data/scripts/maps/DewfordTown_Gym.s"
+	.include "data/scripts/maps/DewfordTown_Hall.s"
+	.include "data/scripts/maps/DewfordTown_House2.s"
+	.include "data/scripts/maps/LavaridgeTown_HerbShop.s"
+	.include "data/scripts/maps/LavaridgeTown_Gym_1F.s"
+	.include "data/scripts/maps/LavaridgeTown_Gym_B1F.s"
+	.include "data/scripts/maps/LavaridgeTown_House.s"
+	.include "data/scripts/maps/LavaridgeTown_Mart.s"
+	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s"
+	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s"
+	.include "data/scripts/maps/FallarborTown_Mart.s"
+	.include "data/scripts/maps/FallarborTown_ContestLobby.s"
+	.include "data/scripts/maps/FallarborTown_ContestHall.s"
+	.include "data/scripts/maps/FallarborTown_PokemonCenter_1F.s"
+	.include "data/scripts/maps/FallarborTown_PokemonCenter_2F.s"
+	.include "data/scripts/maps/FallarborTown_House1.s"
+	.include "data/scripts/maps/FallarborTown_House2.s"
+	.include "data/scripts/maps/VerdanturfTown_ContestLobby.s"
+	.include "data/scripts/maps/VerdanturfTown_ContestHall.s"
+	.include "data/scripts/maps/VerdanturfTown_Mart.s"
+	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s"
+	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s"
+	.include "data/scripts/maps/VerdanturfTown_WandasHouse.s"
+	.include "data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s"
+	.include "data/scripts/maps/VerdanturfTown_House.s"
+	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s"
+	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s"
+	.include "data/scripts/maps/PacifidlogTown_House1.s"
+	.include "data/scripts/maps/PacifidlogTown_House2.s"
+	.include "data/scripts/maps/PacifidlogTown_House3.s"
+	.include "data/scripts/maps/PacifidlogTown_House4.s"
+	.include "data/scripts/maps/PacifidlogTown_House5.s"
+	.include "data/scripts/maps/PetalburgCity_WallysHouse.s"
+	.include "data/scripts/maps/PetalburgCity_Gym.s"
+	.include "data/scripts/maps/PetalburgCity_House1.s"
+	.include "data/scripts/maps/PetalburgCity_House2.s"
+	.include "data/scripts/maps/PetalburgCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/PetalburgCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/PetalburgCity_Mart.s"
+	.include "data/scripts/maps/SlateportCity_SternsShipyard_1F.s"
+	.include "data/scripts/maps/SlateportCity_SternsShipyard_2F.s"
+	.include "data/scripts/maps/SlateportCity_ContestLobby.s"
+	.include "data/scripts/maps/SlateportCity_ContestHall.s"
+	.include "data/scripts/maps/SlateportCity_House1.s"
+	.include "data/scripts/maps/SlateportCity_PokemonFanClub.s"
+	.include "data/scripts/maps/SlateportCity_OceanicMuseum_1F.s"
+	.include "data/scripts/maps/SlateportCity_OceanicMuseum_2F.s"
+	.include "data/scripts/maps/SlateportCity_Harbor.s"
+	.include "data/scripts/maps/SlateportCity_House2.s"
+	.include "data/scripts/maps/SlateportCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/SlateportCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/SlateportCity_Mart.s"
+	.include "data/scripts/maps/MauvilleCity_Gym.s"
+	.include "data/scripts/maps/MauvilleCity_BikeShop.s"
+	.include "data/scripts/maps/MauvilleCity_House1.s"
+	.include "data/scripts/maps/MauvilleCity_GameCorner.s"
+	.include "data/scripts/maps/MauvilleCity_House2.s"
+	.include "data/scripts/maps/MauvilleCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/MauvilleCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/MauvilleCity_Mart.s"
+	.include "data/scripts/maps/RustboroCity_DevonCorp_1F.s"
+	.include "data/scripts/maps/RustboroCity_DevonCorp_2F.s"
+	.include "data/scripts/maps/RustboroCity_DevonCorp_3F.s"
+	.include "data/scripts/maps/RustboroCity_Gym.s"
+	.include "data/scripts/maps/RustboroCity_PokemonSchool.s"
+	.include "data/scripts/maps/RustboroCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/RustboroCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/RustboroCity_Mart.s"
+	.include "data/scripts/maps/RustboroCity_Flat1_1F.s"
+	.include "data/scripts/maps/RustboroCity_Flat1_2F.s"
+	.include "data/scripts/maps/RustboroCity_House1.s"
+	.include "data/scripts/maps/RustboroCity_CuttersHouse.s"
+	.include "data/scripts/maps/RustboroCity_House2.s"
+	.include "data/scripts/maps/RustboroCity_Flat2_1F.s"
+	.include "data/scripts/maps/RustboroCity_Flat2_2F.s"
+	.include "data/scripts/maps/RustboroCity_Flat2_3F.s"
+	.include "data/scripts/maps/RustboroCity_House3.s"
+	.include "data/scripts/maps/FortreeCity_House1.s"
+	.include "data/scripts/maps/FortreeCity_Gym.s"
+	.include "data/scripts/maps/FortreeCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/FortreeCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/FortreeCity_Mart.s"
+	.include "data/scripts/maps/FortreeCity_House2.s"
+	.include "data/scripts/maps/FortreeCity_House3.s"
+	.include "data/scripts/maps/FortreeCity_House4.s"
+	.include "data/scripts/maps/FortreeCity_House5.s"
+	.include "data/scripts/maps/FortreeCity_DecorationShop.s"
+	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s"
+	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s"
+	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s"
+	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s"
+	.include "data/scripts/maps/LilycoveCity_ContestLobby.s"
+	.include "data/scripts/maps/LilycoveCity_ContestHall.s"
+	.include "data/scripts/maps/LilycoveCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/LilycoveCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/LilycoveCity_UnusedMart.s"
+	.include "data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s"
+	.include "data/scripts/maps/LilycoveCity_Harbor.s"
+	.include "data/scripts/maps/LilycoveCity_EmptyMap.s"
+	.include "data/scripts/maps/LilycoveCity_MoveDeletersHouse.s"
+	.include "data/scripts/maps/LilycoveCity_House1.s"
+	.include "data/scripts/maps/LilycoveCity_House2.s"
+	.include "data/scripts/maps/LilycoveCity_House3.s"
+	.include "data/scripts/maps/LilycoveCity_House4.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_1F.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_2F.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_3F.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_4F.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStore_5F.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s"
+	.include "data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s"
+	.include "data/scripts/maps/MossdeepCity_Gym.s"
+	.include "data/scripts/maps/MossdeepCity_House1.s"
+	.include "data/scripts/maps/MossdeepCity_House2.s"
+	.include "data/scripts/maps/MossdeepCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/MossdeepCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/MossdeepCity_Mart.s"
+	.include "data/scripts/maps/MossdeepCity_House3.s"
+	.include "data/scripts/maps/MossdeepCity_StevensHouse.s"
+	.include "data/scripts/maps/MossdeepCity_House4.s"
+	.include "data/scripts/maps/MossdeepCity_SpaceCenter_1F.s"
+	.include "data/scripts/maps/MossdeepCity_SpaceCenter_2F.s"
+	.include "data/scripts/maps/MossdeepCity_GameCorner_1F.s"
+	.include "data/scripts/maps/MossdeepCity_GameCorner_B1F.s"
+	.include "data/scripts/maps/SootopolisCity_Gym_1F.s"
+	.include "data/scripts/maps/SootopolisCity_Gym_B1F.s"
+	.include "data/scripts/maps/SootopolisCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/SootopolisCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/SootopolisCity_Mart.s"
+	.include "data/scripts/maps/SootopolisCity_House1.s"
+	.include "data/scripts/maps/SootopolisCity_House2.s"
+	.include "data/scripts/maps/SootopolisCity_House3.s"
+	.include "data/scripts/maps/SootopolisCity_House4.s"
+	.include "data/scripts/maps/SootopolisCity_House5.s"
+	.include "data/scripts/maps/SootopolisCity_House6.s"
+	.include "data/scripts/maps/SootopolisCity_House7.s"
+	.include "data/scripts/maps/SootopolisCity_House8.s"
+	.include "data/scripts/maps/EverGrandeCity_SidneysRoom.s"
+	.include "data/scripts/maps/EverGrandeCity_PhoebesRoom.s"
+	.include "data/scripts/maps/EverGrandeCity_GlaciasRoom.s"
+	.include "data/scripts/maps/EverGrandeCity_DrakesRoom.s"
+	.include "data/scripts/maps/EverGrandeCity_ChampionsRoom.s"
+	.include "data/scripts/maps/EverGrandeCity_Corridor1.s"
+	.include "data/scripts/maps/EverGrandeCity_Corridor2.s"
+	.include "data/scripts/maps/EverGrandeCity_Corridor3.s"
+	.include "data/scripts/maps/EverGrandeCity_Corridor4.s"
+	.include "data/scripts/maps/EverGrandeCity_Corridor5.s"
+	.include "data/scripts/maps/EverGrandeCity_PokemonLeague.s"
+	.include "data/scripts/maps/EverGrandeCity_HallOfFame.s"
+	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s"
+	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s"
+	.include "data/scripts/maps/Route104_MrBrineysHouse.s"
+	.include "data/scripts/maps/Route104_PrettyPetalFlowerShop.s"
+	.include "data/scripts/maps/Route111_WinstrateFamilysHouse.s"
+	.include "data/scripts/maps/Route111_OldLadysRestStop.s"
+	.include "data/scripts/maps/Route112_CableCarStation.s"
+	.include "data/scripts/maps/MtChimney_CableCarStation.s"
+	.include "data/scripts/maps/Route114_FossilManiacsHouse.s"
+	.include "data/scripts/maps/Route114_FossilManiacsTunnel.s"
+	.include "data/scripts/maps/Route114_LanettesHouse.s"
+	.include "data/scripts/maps/Route116_TunnelersRestHouse.s"
+	.include "data/scripts/maps/Route117_PokemonDayCare.s"
+	.include "data/scripts/maps/Route121_SafariZoneEntrance.s"
+	.include "data/scripts/maps/MeteorFalls_1F_1R.s"
+	.include "data/scripts/maps/MeteorFalls_1F_2R.s"
+	.include "data/scripts/maps/MeteorFalls_B1F_1R.s"
+	.include "data/scripts/maps/MeteorFalls_B1F_2R.s"
+	.include "data/scripts/maps/RusturfTunnel.s"
+	.include "data/scripts/maps/Underwater_SootopolisCity.s"
+	.include "data/scripts/maps/DesertRuins.s"
+	.include "data/scripts/maps/GraniteCave_1F.s"
+	.include "data/scripts/maps/GraniteCave_B1F.s"
+	.include "data/scripts/maps/GraniteCave_B2F.s"
+	.include "data/scripts/maps/GraniteCave_StevensRoom.s"
+	.include "data/scripts/maps/PetalburgWoods.s"
+	.include "data/scripts/maps/MtChimney.s"
+	.include "data/scripts/maps/JaggedPass.s"
+	.include "data/scripts/maps/FieryPath.s"
+	.include "data/scripts/maps/MtPyre_1F.s"
+	.include "data/scripts/maps/MtPyre_2F.s"
+	.include "data/scripts/maps/MtPyre_3F.s"
+	.include "data/scripts/maps/MtPyre_4F.s"
+	.include "data/scripts/maps/MtPyre_5F.s"
+	.include "data/scripts/maps/MtPyre_6F.s"
+	.include "data/scripts/maps/MtPyre_Exterior.s"
+	.include "data/scripts/maps/MtPyre_Summit.s"
+	.include "data/scripts/maps/AquaHideout_1F.s"
+	.include "data/scripts/maps/AquaHideout_B1F.s"
+	.include "data/scripts/maps/AquaHideout_B2F.s"
+	.include "data/scripts/maps/Underwater_SeafloorCavern.s"
+	.include "data/scripts/maps/SeafloorCavern_Entrance.s"
+	.include "data/scripts/maps/SeafloorCavern_Room1.s"
+	.include "data/scripts/maps/SeafloorCavern_Room2.s"
+	.include "data/scripts/maps/SeafloorCavern_Room3.s"
+	.include "data/scripts/maps/SeafloorCavern_Room4.s"
+	.include "data/scripts/maps/SeafloorCavern_Room5.s"
+	.include "data/scripts/maps/SeafloorCavern_Room6.s"
+	.include "data/scripts/maps/SeafloorCavern_Room7.s"
+	.include "data/scripts/maps/SeafloorCavern_Room8.s"
+	.include "data/scripts/maps/SeafloorCavern_Room9.s"
+	.include "data/scripts/maps/CaveOfOrigin_Entrance.s"
+	.include "data/scripts/maps/CaveOfOrigin_1F.s"
+	.include "data/scripts/maps/CaveOfOrigin_B1F.s"
+	.include "data/scripts/maps/CaveOfOrigin_B2F.s"
+	.include "data/scripts/maps/CaveOfOrigin_B3F.s"
+	.include "data/scripts/maps/CaveOfOrigin_B4F.s"
+	.include "data/scripts/maps/VictoryRoad_1F.s"
+	.include "data/scripts/maps/VictoryRoad_B1F.s"
+	.include "data/scripts/maps/VictoryRoad_B2F.s"
+	.include "data/scripts/maps/ShoalCave_LowTideEntranceRoom.s"
+	.include "data/scripts/maps/ShoalCave_LowTideInnerRoom.s"
+	.include "data/scripts/maps/ShoalCave_LowTideStairsRoom.s"
+	.include "data/scripts/maps/ShoalCave_LowTideLowerRoom.s"
+	.include "data/scripts/maps/ShoalCave_HighTideEntranceRoom.s"
+	.include "data/scripts/maps/ShoalCave_HighTideInnerRoom.s"
+	.include "data/scripts/maps/NewMauville_Entrance.s"
+	.include "data/scripts/maps/NewMauville_Inside.s"
+	.include "data/scripts/maps/AbandonedShip_Deck.s"
+	.include "data/scripts/maps/AbandonedShip_Corridors_1F.s"
+	.include "data/scripts/maps/AbandonedShip_Rooms_1F.s"
+	.include "data/scripts/maps/AbandonedShip_Corridors_B1F.s"
+	.include "data/scripts/maps/AbandonedShip_Rooms_B1F.s"
+	.include "data/scripts/maps/AbandonedShip_Rooms2_B1F.s"
+	.include "data/scripts/maps/AbandonedShip_Underwater1.s"
+	.include "data/scripts/maps/AbandonedShip_Room_B1F.s"
+	.include "data/scripts/maps/AbandonedShip_Rooms2_1F.s"
+	.include "data/scripts/maps/AbandonedShip_CaptainsOffice.s"
+	.include "data/scripts/maps/AbandonedShip_Underwater2.s"
+	.include "data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s"
+	.include "data/scripts/maps/AbandonedShip_HiddenFloorRooms.s"
+	.include "data/scripts/maps/IslandCave.s"
+	.include "data/scripts/maps/AncientTomb.s"
+	.include "data/scripts/maps/Underwater_Route134.s"
+	.include "data/scripts/maps/Underwater_SealedChamber.s"
+	.include "data/scripts/maps/SealedChamber_OuterRoom.s"
+	.include "data/scripts/maps/SealedChamber_InnerRoom.s"
+	.include "data/scripts/maps/ScorchedSlab.s"
+	.include "data/scripts/maps/MagmaHideout_1F.s"
+	.include "data/scripts/maps/MagmaHideout_B1F.s"
+	.include "data/scripts/maps/MagmaHideout_B2F.s"
+	.include "data/scripts/maps/SkyPillar_Entrance.s"
+	.include "data/scripts/maps/SkyPillar_Outside.s"
+	.include "data/scripts/maps/SkyPillar_1F.s"
+	.include "data/scripts/maps/SkyPillar_2F.s"
+	.include "data/scripts/maps/SkyPillar_3F.s"
+	.include "data/scripts/maps/SkyPillar_4F.s"
+	.include "data/scripts/maps/ShoalCave_LowTideIceRoom.s"
+	.include "data/scripts/maps/SkyPillar_5F.s"
+	.include "data/scripts/maps/SkyPillar_Top.s"
+	.include "data/scripts/maps/SecretBase_BlueCave1.s"
+	.include "data/scripts/maps/SecretBase_BlueCave2.s"
+	.include "data/scripts/maps/SecretBase_BlueCave3.s"
+	.include "data/scripts/maps/SecretBase_BlueCave4.s"
+	.include "data/scripts/maps/SecretBase_BrownCave1.s"
+	.include "data/scripts/maps/SecretBase_BrownCave2.s"
+	.include "data/scripts/maps/SecretBase_BrownCave3.s"
+	.include "data/scripts/maps/SecretBase_BrownCave4.s"
+	.include "data/scripts/maps/SecretBase_RedCave1.s"
+	.include "data/scripts/maps/SecretBase_RedCave2.s"
+	.include "data/scripts/maps/SecretBase_RedCave3.s"
+	.include "data/scripts/maps/SecretBase_RedCave4.s"
+	.include "data/scripts/maps/SecretBase_Shrub1.s"
+	.include "data/scripts/maps/SecretBase_Shrub2.s"
+	.include "data/scripts/maps/SecretBase_Shrub3.s"
+	.include "data/scripts/maps/SecretBase_Shrub4.s"
+	.include "data/scripts/maps/SecretBase_Tree1.s"
+	.include "data/scripts/maps/SecretBase_Tree2.s"
+	.include "data/scripts/maps/SecretBase_Tree3.s"
+	.include "data/scripts/maps/SecretBase_Tree4.s"
+	.include "data/scripts/maps/SecretBase_YellowCave1.s"
+	.include "data/scripts/maps/SecretBase_YellowCave2.s"
+	.include "data/scripts/maps/SecretBase_YellowCave3.s"
+	.include "data/scripts/maps/SecretBase_YellowCave4.s"
 
 gUnknown_0815F36C:: @ 815F36C
 	lockall
@@ -546,306 +548,306 @@ EventScript_15F573:
 	msgbox UnknownString_81A3C31, 3
 	end
 
-	.include "data/maps/scripts/SingleBattleColosseum.s"
-	.include "data/maps/scripts/TradeCenter.s"
-	.include "data/maps/scripts/RecordCorner.s"
-	.include "data/maps/scripts/DoubleBattleColosseum.s"
-	.include "data/maps/scripts/LinkContestRoom1.s"
-	.include "data/maps/scripts/LinkContestRoom2.s"
-	.include "data/maps/scripts/LinkContestRoom3.s"
-	.include "data/maps/scripts/LinkContestRoom4.s"
-	.include "data/maps/scripts/LinkContestRoom5.s"
-	.include "data/maps/scripts/LinkContestRoom6.s"
-	.include "data/maps/scripts/UnknownMap_25_29.s"
-	.include "data/maps/scripts/UnknownMap_25_30.s"
-	.include "data/maps/scripts/UnknownMap_25_31.s"
-	.include "data/maps/scripts/UnknownMap_25_32.s"
-	.include "data/maps/scripts/UnknownMap_25_33.s"
-	.include "data/maps/scripts/UnknownMap_25_34.s"
-	.include "data/maps/scripts/InsideOfTruck.s"
-	.include "data/maps/scripts/SSTidalCorridor.s"
-	.include "data/maps/scripts/SSTidalLowerDeck.s"
-	.include "data/maps/scripts/SSTidalRooms.s"
-	.include "data/maps/scripts/SafariZone_Northwest.s"
-	.include "data/maps/scripts/SafariZone_Northeast.s"
-	.include "data/maps/scripts/SafariZone_Southwest.s"
-	.include "data/maps/scripts/SafariZone_Southeast.s"
-	.include "data/maps/scripts/BattleTower_Outside.s"
-	.include "data/maps/scripts/BattleTower_Lobby.s"
-	.include "data/maps/scripts/BattleTower_Elevator.s"
-	.include "data/maps/scripts/BattleTower_Corridor.s"
-	.include "data/maps/scripts/BattleTower_BattleRoom.s"
-	.include "data/maps/scripts/SouthernIsland_Exterior.s"
-	.include "data/maps/scripts/SouthernIsland_Interior.s"
-	.include "data/maps/scripts/SafariZone_RestHouse.s"
-	.include "data/maps/scripts/Route104_Prototype.s"
-	.include "data/maps/scripts/Route104_PrototypePrettyPetalFlowerShop.s"
-	.include "data/maps/scripts/Route109_SeashoreHouse.s"
-	.include "data/maps/scripts/Route110_TrickHouseEntrance.s"
-	.include "data/maps/scripts/Route110_TrickHouseEnd.s"
-	.include "data/maps/scripts/Route110_TrickHouseCorridor.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle1.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle2.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle3.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle4.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle5.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle6.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle7.s"
-	.include "data/maps/scripts/Route110_TrickHousePuzzle8.s"
-	.include "data/maps/scripts/Route110_SeasideCyclingRoadSouthEntrance.s"
-	.include "data/maps/scripts/Route110_SeasideCyclingRoadNorthEntrance.s"
-	.include "data/maps/scripts/Route113_GlassWorkshop.s"
-	.include "data/maps/scripts/Route123_BerryMastersHouse.s"
-	.include "data/maps/scripts/Route119_WeatherInstitute_1F.s"
-	.include "data/maps/scripts/Route119_WeatherInstitute_2F.s"
-	.include "data/maps/scripts/Route119_House.s"
-	.include "data/maps/scripts/Route124_DivingTreasureHuntersHouse.s"
-
-	.include "data/maps/text/PetalburgCity.s"
-	.include "data/maps/text/SlateportCity.s"
-	.include "data/maps/text/MauvilleCity.s"
-	.include "data/maps/text/RustboroCity.s"
-	.include "data/maps/text/FortreeCity.s"
-	.include "data/maps/text/LilycoveCity.s"
-	.include "data/maps/text/MossdeepCity.s"
-	.include "data/maps/text/SootopolisCity.s"
-	.include "data/maps/text/EverGrandeCity.s"
-	.include "data/maps/text/LittlerootTown.s"
-	.include "data/maps/text/OldaleTown.s"
-	.include "data/maps/text/DewfordTown.s"
-	.include "data/maps/text/LavaridgeTown.s"
-	.include "data/maps/text/FallarborTown.s"
-	.include "data/maps/text/VerdanturfTown.s"
-	.include "data/maps/text/PacifidlogTown.s"
-	.include "data/maps/text/Route101.s"
-	.include "data/maps/text/Route102.s"
-	.include "data/maps/text/Route103.s"
-	.include "data/maps/text/Route104.s"
-	.include "data/maps/text/Route105.s"
-	.include "data/maps/text/Route106.s"
-	.include "data/maps/text/Route107.s"
-	.include "data/maps/text/Route108.s"
-	.include "data/maps/text/Route109.s"
-	.include "data/maps/text/Route110.s"
-	.include "data/maps/text/Route111.s"
-	.include "data/maps/text/Route112.s"
-	.include "data/maps/text/Route113.s"
-	.include "data/maps/text/Route114.s"
-	.include "data/maps/text/Route115.s"
-	.include "data/maps/text/Route116.s"
-	.include "data/maps/text/Route117.s"
-	.include "data/maps/text/Route118.s"
-	.include "data/maps/text/Route119.s"
-	.include "data/maps/text/Route120.s"
-	.include "data/maps/text/Route121.s"
-	.include "data/maps/text/Route123.s"
-	.include "data/maps/text/Route124.s"
-	.include "data/maps/text/Route128.s"
-	.include "data/maps/text/LittlerootTown_BrendansHouse_1F.s"
-	.include "data/maps/text/LittlerootTown_BrendansHouse_2F.s"
-	.include "data/maps/text/LittlerootTown_MaysHouse_1F.s"
-	.include "data/maps/text/LittlerootTown_MaysHouse_2F.s"
-	.include "data/maps/text/LittlerootTown_ProfessorBirchsLab.s"
-	.include "data/maps/text/OldaleTown_House1.s"
-	.include "data/maps/text/OldaleTown_House2.s"
-	.include "data/maps/text/OldaleTown_PokemonCenter_1F.s"
-	.include "data/maps/text/OldaleTown_Mart.s"
-	.include "data/maps/text/DewfordTown_House1.s"
-	.include "data/maps/text/DewfordTown_PokemonCenter_1F.s"
-	.include "data/maps/text/DewfordTown_Gym.s"
-	.include "data/maps/text/DewfordTown_Hall.s"
-	.include "data/maps/text/DewfordTown_House2.s"
-	.include "data/maps/text/LavaridgeTown_HerbShop.s"
-	.include "data/maps/text/LavaridgeTown_Gym_1F.s"
-	.include "data/maps/text/LavaridgeTown_House.s"
-	.include "data/maps/text/LavaridgeTown_Mart.s"
-	.include "data/maps/text/LavaridgeTown_PokemonCenter_1F.s"
-	.include "data/maps/text/FallarborTown_Mart.s"
-	.include "data/maps/text/FallarborTown_ContestLobby.s"
-	.include "data/maps/text/FallarborTown_ContestHall.s"
-	.include "data/maps/text/FallarborTown_PokemonCenter_1F.s"
-	.include "data/maps/text/FallarborTown_House1.s"
-	.include "data/maps/text/FallarborTown_House2.s"
-	.include "data/maps/text/VerdanturfTown_ContestLobby.s"
-	.include "data/maps/text/VerdanturfTown_ContestHall.s"
-	.include "data/maps/text/VerdanturfTown_Mart.s"
-	.include "data/maps/text/VerdanturfTown_PokemonCenter_1F.s"
-	.include "data/maps/text/VerdanturfTown_WandasHouse.s"
-	.include "data/maps/text/VerdanturfTown_FriendshipRatersHouse.s"
-	.include "data/maps/text/VerdanturfTown_House.s"
-	.include "data/maps/text/PacifidlogTown_PokemonCenter_1F.s"
-	.include "data/maps/text/PacifidlogTown_House1.s"
-	.include "data/maps/text/PacifidlogTown_House2.s"
-	.include "data/maps/text/PacifidlogTown_House3.s"
-	.include "data/maps/text/PacifidlogTown_House4.s"
-	.include "data/maps/text/PacifidlogTown_House5.s"
-	.include "data/maps/text/PetalburgCity_WallysHouse.s"
-	.include "data/maps/text/PetalburgCity_Gym.s"
-	.include "data/maps/text/PetalburgCity_House1.s"
-	.include "data/maps/text/PetalburgCity_House2.s"
-	.include "data/maps/text/PetalburgCity_PokemonCenter_1F.s"
-	.include "data/maps/text/PetalburgCity_Mart.s"
-	.include "data/maps/text/SlateportCity_SternsShipyard_1F.s"
-	.include "data/maps/text/SlateportCity_SternsShipyard_2F.s"
-	.include "data/maps/text/SlateportCity_ContestLobby.s"
-	.include "data/maps/text/SlateportCity_ContestHall.s"
-	.include "data/maps/text/SlateportCity_House1.s"
-	.include "data/maps/text/SlateportCity_PokemonFanClub.s"
-	.include "data/maps/text/SlateportCity_OceanicMuseum_1F.s"
-	.include "data/maps/text/SlateportCity_OceanicMuseum_2F.s"
-	.include "data/maps/text/SlateportCity_Harbor.s"
-	.include "data/maps/text/SlateportCity_House2.s"
-	.include "data/maps/text/SlateportCity_PokemonCenter_1F.s"
-	.include "data/maps/text/SlateportCity_Mart.s"
-	.include "data/maps/text/MauvilleCity_Gym.s"
-	.include "data/maps/text/MauvilleCity_BikeShop.s"
-	.include "data/maps/text/MauvilleCity_House1.s"
-	.include "data/maps/text/MauvilleCity_GameCorner.s"
-	.include "data/maps/text/MauvilleCity_House2.s"
-	.include "data/maps/text/MauvilleCity_PokemonCenter_1F.s"
-	.include "data/maps/text/MauvilleCity_PokemonCenter_2F.s"
-	.include "data/maps/text/MauvilleCity_Mart.s"
-	.include "data/maps/text/RustboroCity_DevonCorp_1F.s"
-	.include "data/maps/text/RustboroCity_DevonCorp_2F.s"
-	.include "data/maps/text/RustboroCity_DevonCorp_3F.s"
-	.include "data/maps/text/RustboroCity_Gym.s"
-	.include "data/maps/text/RustboroCity_PokemonSchool.s"
-	.include "data/maps/text/RustboroCity_PokemonCenter_1F.s"
-	.include "data/maps/text/RustboroCity_Mart.s"
-	.include "data/maps/text/RustboroCity_Flat1_1F.s"
-	.include "data/maps/text/RustboroCity_Flat1_2F.s"
-	.include "data/maps/text/RustboroCity_House1.s"
-	.include "data/maps/text/RustboroCity_CuttersHouse.s"
-	.include "data/maps/text/RustboroCity_House2.s"
-	.include "data/maps/text/RustboroCity_Flat2_1F.s"
-	.include "data/maps/text/RustboroCity_Flat2_2F.s"
-	.include "data/maps/text/RustboroCity_Flat2_3F.s"
-	.include "data/maps/text/RustboroCity_House3.s"
-	.include "data/maps/text/FortreeCity_House1.s"
-	.include "data/maps/text/FortreeCity_Gym.s"
-	.include "data/maps/text/FortreeCity_PokemonCenter_1F.s"
-	.include "data/maps/text/FortreeCity_Mart.s"
-	.include "data/maps/text/FortreeCity_House2.s"
-	.include "data/maps/text/FortreeCity_House3.s"
-	.include "data/maps/text/FortreeCity_House4.s"
-	.include "data/maps/text/FortreeCity_House5.s"
-	.include "data/maps/text/FortreeCity_DecorationShop.s"
-	.include "data/maps/text/LilycoveCity_CoveLilyMotel_1F.s"
-	.include "data/maps/text/LilycoveCity_CoveLilyMotel_2F.s"
-	.include "data/maps/text/LilycoveCity_LilycoveMuseum_1F.s"
-	.include "data/maps/text/LilycoveCity_LilycoveMuseum_2F.s"
-	.include "data/maps/text/LilycoveCity_ContestLobby.s"
-	.include "data/maps/text/LilycoveCity_ContestHall.s"
-	.include "data/maps/text/LilycoveCity_PokemonCenter_1F.s"
-	.include "data/maps/text/LilycoveCity_PokemonTrainerFanClub.s"
-	.include "data/maps/text/LilycoveCity_Harbor.s"
-	.include "data/maps/text/LilycoveCity_MoveDeletersHouse.s"
-	.include "data/maps/text/LilycoveCity_House1.s"
-	.include "data/maps/text/LilycoveCity_House2.s"
-	.include "data/maps/text/LilycoveCity_House3.s"
-	.include "data/maps/text/LilycoveCity_House4.s"
-	.include "data/maps/text/LilycoveCity_DepartmentStore_1F.s"
-	.include "data/maps/text/LilycoveCity_DepartmentStore_2F.s"
-	.include "data/maps/text/LilycoveCity_DepartmentStore_3F.s"
-	.include "data/maps/text/LilycoveCity_DepartmentStore_4F.s"
-	.include "data/maps/text/LilycoveCity_DepartmentStore_5F.s"
-	.include "data/maps/text/LilycoveCity_DepartmentStoreRooftop.s"
-	.include "data/maps/text/MossdeepCity_Gym.s"
-	.include "data/maps/text/MossdeepCity_House1.s"
-	.include "data/maps/text/MossdeepCity_House2.s"
-	.include "data/maps/text/MossdeepCity_PokemonCenter_1F.s"
-	.include "data/maps/text/MossdeepCity_PokemonCenter_2F.s"
-	.include "data/maps/text/MossdeepCity_Mart.s"
-	.include "data/maps/text/MossdeepCity_House3.s"
-	.include "data/maps/text/MossdeepCity_StevensHouse.s"
-	.include "data/maps/text/MossdeepCity_House4.s"
-	.include "data/maps/text/MossdeepCity_SpaceCenter_1F.s"
-	.include "data/maps/text/MossdeepCity_SpaceCenter_2F.s"
-	.include "data/maps/text/MossdeepCity_GameCorner_1F.s"
-	.include "data/maps/text/MossdeepCity_GameCorner_B1F.s"
-	.include "data/maps/text/SootopolisCity_Gym_1F.s"
-	.include "data/maps/text/SootopolisCity_Gym_B1F.s"
-	.include "data/maps/text/SootopolisCity_PokemonCenter_1F.s"
-	.include "data/maps/text/SootopolisCity_Mart.s"
-	.include "data/maps/text/SootopolisCity_House1.s"
-	.include "data/maps/text/SootopolisCity_House2.s"
-	.include "data/maps/text/SootopolisCity_House3.s"
-	.include "data/maps/text/SootopolisCity_House4.s"
-	.include "data/maps/text/SootopolisCity_House5.s"
-	.include "data/maps/text/SootopolisCity_House6.s"
-	.include "data/maps/text/SootopolisCity_House7.s"
-	.include "data/maps/text/SootopolisCity_House8.s"
-	.include "data/maps/text/EverGrandeCity_SidneysRoom.s"
-	.include "data/maps/text/EverGrandeCity_PhoebesRoom.s"
-	.include "data/maps/text/EverGrandeCity_GlaciasRoom.s"
-	.include "data/maps/text/EverGrandeCity_DrakesRoom.s"
-	.include "data/maps/text/EverGrandeCity_ChampionsRoom.s"
-	.include "data/maps/text/EverGrandeCity_PokemonLeague.s"
-	.include "data/maps/text/EverGrandeCity_HallOfFame.s"
-	.include "data/maps/text/EverGrandeCity_PokemonCenter_1F.s"
-	.include "data/maps/text/Route104_MrBrineysHouse.s"
-	.include "data/maps/text/Route111_WinstrateFamilysHouse.s"
-	.include "data/maps/text/Route111_OldLadysRestStop.s"
-	.include "data/maps/text/Route112_CableCarStation.s"
-	.include "data/maps/text/MtChimney_CableCarStation.s"
-	.include "data/maps/text/Route114_FossilManiacsHouse.s"
-	.include "data/maps/text/Route114_FossilManiacsTunnel.s"
-	.include "data/maps/text/Route114_LanettesHouse.s"
-	.include "data/maps/text/Route116_TunnelersRestHouse.s"
-	.include "data/maps/text/MeteorFalls_1F_1R.s"
-	.include "data/maps/text/MeteorFalls_1F_2R.s"
-	.include "data/maps/text/RusturfTunnel.s"
-	.include "data/maps/text/GraniteCave_1F.s"
-	.include "data/maps/text/GraniteCave_StevensRoom.s"
-	.include "data/maps/text/PetalburgWoods.s"
-	.include "data/maps/text/MtChimney.s"
-	.include "data/maps/text/JaggedPass.s"
-	.include "data/maps/text/MtPyre_1F.s"
-	.include "data/maps/text/MtPyre_2F.s"
-	.include "data/maps/text/MtPyre_3F.s"
-	.include "data/maps/text/MtPyre_4F.s"
-	.include "data/maps/text/MtPyre_5F.s"
-	.include "data/maps/text/MtPyre_6F.s"
-	.include "data/maps/text/AquaHideout_1F.s"
-	.include "data/maps/text/AquaHideout_B1F.s"
-	.include "data/maps/text/AquaHideout_B2F.s"
-	.include "data/maps/text/Underwater_SeafloorCavern.s"
-	.include "data/maps/text/SeafloorCavern_Room1.s"
-	.include "data/maps/text/SeafloorCavern_Room3.s"
-	.include "data/maps/text/SeafloorCavern_Room4.s"
-	.include "data/maps/text/VictoryRoad_1F.s"
-	.include "data/maps/text/VictoryRoad_B1F.s"
-	.include "data/maps/text/VictoryRoad_B2F.s"
-	.include "data/maps/text/ShoalCave_LowTideEntranceRoom.s"
-	.include "data/maps/text/ShoalCave_LowTideInnerRoom.s"
-	.include "data/maps/text/ShoalCave_LowTideStairsRoom.s"
-	.include "data/maps/text/ShoalCave_LowTideLowerRoom.s"
-	.include "data/maps/text/NewMauville_Entrance.s"
-	.include "data/maps/text/NewMauville_Inside.s"
-	.include "data/maps/text/AbandonedShip_Corridors_1F.s"
-	.include "data/maps/text/AbandonedShip_Rooms_1F.s"
-	.include "data/maps/text/AbandonedShip_Corridors_B1F.s"
-	.include "data/maps/text/AbandonedShip_HiddenFloorCorridors.s"
-	.include "data/maps/text/AbandonedShip_Rooms_B1F.s"
-	.include "data/maps/text/AbandonedShip_Rooms2_B1F.s"
-	.include "data/maps/text/AbandonedShip_Rooms2_1F.s"
-	.include "data/maps/text/AbandonedShip_CaptainsOffice.s"
-	.include "data/maps/text/AbandonedShip_HiddenFloorRooms.s"
-	.include "data/maps/text/SecretBase_RedCave1.s"
-	.include "data/maps/text/InsideOfTruck.s"
-	.include "data/maps/text/SSTidalCorridor.s"
-	.include "data/maps/text/SSTidalLowerDeck.s"
-	.include "data/maps/text/SSTidalRooms.s"
-	.include "data/maps/text/BattleTower_Outside.s"
-	.include "data/maps/text/BattleTower_Lobby.s"
-	.include "data/maps/text/BattleTower_BattleRoom.s"
-	.include "data/maps/text/SouthernIsland_Exterior.s"
-	.include "data/maps/text/SouthernIsland_Interior.s"
-	.include "data/maps/text/SafariZone_RestHouse.s"
-	.include "data/maps/text/Route104_Prototype.s"
-	.include "data/maps/text/Route104_PrototypePrettyPetalFlowerShop.s"
-	.include "data/maps/text/Route109_SeashoreHouse.s"
-	.include "data/maps/text/Route110_TrickHouseEntrance.s"
+	.include "data/scripts/maps/SingleBattleColosseum.s"
+	.include "data/scripts/maps/TradeCenter.s"
+	.include "data/scripts/maps/RecordCorner.s"
+	.include "data/scripts/maps/DoubleBattleColosseum.s"
+	.include "data/scripts/maps/LinkContestRoom1.s"
+	.include "data/scripts/maps/LinkContestRoom2.s"
+	.include "data/scripts/maps/LinkContestRoom3.s"
+	.include "data/scripts/maps/LinkContestRoom4.s"
+	.include "data/scripts/maps/LinkContestRoom5.s"
+	.include "data/scripts/maps/LinkContestRoom6.s"
+	.include "data/scripts/maps/UnknownMap_25_29.s"
+	.include "data/scripts/maps/UnknownMap_25_30.s"
+	.include "data/scripts/maps/UnknownMap_25_31.s"
+	.include "data/scripts/maps/UnknownMap_25_32.s"
+	.include "data/scripts/maps/UnknownMap_25_33.s"
+	.include "data/scripts/maps/UnknownMap_25_34.s"
+	.include "data/scripts/maps/InsideOfTruck.s"
+	.include "data/scripts/maps/SSTidalCorridor.s"
+	.include "data/scripts/maps/SSTidalLowerDeck.s"
+	.include "data/scripts/maps/SSTidalRooms.s"
+	.include "data/scripts/maps/SafariZone_Northwest.s"
+	.include "data/scripts/maps/SafariZone_Northeast.s"
+	.include "data/scripts/maps/SafariZone_Southwest.s"
+	.include "data/scripts/maps/SafariZone_Southeast.s"
+	.include "data/scripts/maps/BattleTower_Outside.s"
+	.include "data/scripts/maps/BattleTower_Lobby.s"
+	.include "data/scripts/maps/BattleTower_Elevator.s"
+	.include "data/scripts/maps/BattleTower_Corridor.s"
+	.include "data/scripts/maps/BattleTower_BattleRoom.s"
+	.include "data/scripts/maps/SouthernIsland_Exterior.s"
+	.include "data/scripts/maps/SouthernIsland_Interior.s"
+	.include "data/scripts/maps/SafariZone_RestHouse.s"
+	.include "data/scripts/maps/Route104_Prototype.s"
+	.include "data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s"
+	.include "data/scripts/maps/Route109_SeashoreHouse.s"
+	.include "data/scripts/maps/Route110_TrickHouseEntrance.s"
+	.include "data/scripts/maps/Route110_TrickHouseEnd.s"
+	.include "data/scripts/maps/Route110_TrickHouseCorridor.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle1.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle2.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle3.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle4.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle5.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle6.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle7.s"
+	.include "data/scripts/maps/Route110_TrickHousePuzzle8.s"
+	.include "data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s"
+	.include "data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s"
+	.include "data/scripts/maps/Route113_GlassWorkshop.s"
+	.include "data/scripts/maps/Route123_BerryMastersHouse.s"
+	.include "data/scripts/maps/Route119_WeatherInstitute_1F.s"
+	.include "data/scripts/maps/Route119_WeatherInstitute_2F.s"
+	.include "data/scripts/maps/Route119_House.s"
+	.include "data/scripts/maps/Route124_DivingTreasureHuntersHouse.s"
+
+	.include "data/text/maps/PetalburgCity.s"
+	.include "data/text/maps/SlateportCity.s"
+	.include "data/text/maps/MauvilleCity.s"
+	.include "data/text/maps/RustboroCity.s"
+	.include "data/text/maps/FortreeCity.s"
+	.include "data/text/maps/LilycoveCity.s"
+	.include "data/text/maps/MossdeepCity.s"
+	.include "data/text/maps/SootopolisCity.s"
+	.include "data/text/maps/EverGrandeCity.s"
+	.include "data/text/maps/LittlerootTown.s"
+	.include "data/text/maps/OldaleTown.s"
+	.include "data/text/maps/DewfordTown.s"
+	.include "data/text/maps/LavaridgeTown.s"
+	.include "data/text/maps/FallarborTown.s"
+	.include "data/text/maps/VerdanturfTown.s"
+	.include "data/text/maps/PacifidlogTown.s"
+	.include "data/text/maps/Route101.s"
+	.include "data/text/maps/Route102.s"
+	.include "data/text/maps/Route103.s"
+	.include "data/text/maps/Route104.s"
+	.include "data/text/maps/Route105.s"
+	.include "data/text/maps/Route106.s"
+	.include "data/text/maps/Route107.s"
+	.include "data/text/maps/Route108.s"
+	.include "data/text/maps/Route109.s"
+	.include "data/text/maps/Route110.s"
+	.include "data/text/maps/Route111.s"
+	.include "data/text/maps/Route112.s"
+	.include "data/text/maps/Route113.s"
+	.include "data/text/maps/Route114.s"
+	.include "data/text/maps/Route115.s"
+	.include "data/text/maps/Route116.s"
+	.include "data/text/maps/Route117.s"
+	.include "data/text/maps/Route118.s"
+	.include "data/text/maps/Route119.s"
+	.include "data/text/maps/Route120.s"
+	.include "data/text/maps/Route121.s"
+	.include "data/text/maps/Route123.s"
+	.include "data/text/maps/Route124.s"
+	.include "data/text/maps/Route128.s"
+	.include "data/text/maps/LittlerootTown_BrendansHouse_1F.s"
+	.include "data/text/maps/LittlerootTown_BrendansHouse_2F.s"
+	.include "data/text/maps/LittlerootTown_MaysHouse_1F.s"
+	.include "data/text/maps/LittlerootTown_MaysHouse_2F.s"
+	.include "data/text/maps/LittlerootTown_ProfessorBirchsLab.s"
+	.include "data/text/maps/OldaleTown_House1.s"
+	.include "data/text/maps/OldaleTown_House2.s"
+	.include "data/text/maps/OldaleTown_PokemonCenter_1F.s"
+	.include "data/text/maps/OldaleTown_Mart.s"
+	.include "data/text/maps/DewfordTown_House1.s"
+	.include "data/text/maps/DewfordTown_PokemonCenter_1F.s"
+	.include "data/text/maps/DewfordTown_Gym.s"
+	.include "data/text/maps/DewfordTown_Hall.s"
+	.include "data/text/maps/DewfordTown_House2.s"
+	.include "data/text/maps/LavaridgeTown_HerbShop.s"
+	.include "data/text/maps/LavaridgeTown_Gym_1F.s"
+	.include "data/text/maps/LavaridgeTown_House.s"
+	.include "data/text/maps/LavaridgeTown_Mart.s"
+	.include "data/text/maps/LavaridgeTown_PokemonCenter_1F.s"
+	.include "data/text/maps/FallarborTown_Mart.s"
+	.include "data/text/maps/FallarborTown_ContestLobby.s"
+	.include "data/text/maps/FallarborTown_ContestHall.s"
+	.include "data/text/maps/FallarborTown_PokemonCenter_1F.s"
+	.include "data/text/maps/FallarborTown_House1.s"
+	.include "data/text/maps/FallarborTown_House2.s"
+	.include "data/text/maps/VerdanturfTown_ContestLobby.s"
+	.include "data/text/maps/VerdanturfTown_ContestHall.s"
+	.include "data/text/maps/VerdanturfTown_Mart.s"
+	.include "data/text/maps/VerdanturfTown_PokemonCenter_1F.s"
+	.include "data/text/maps/VerdanturfTown_WandasHouse.s"
+	.include "data/text/maps/VerdanturfTown_FriendshipRatersHouse.s"
+	.include "data/text/maps/VerdanturfTown_House.s"
+	.include "data/text/maps/PacifidlogTown_PokemonCenter_1F.s"
+	.include "data/text/maps/PacifidlogTown_House1.s"
+	.include "data/text/maps/PacifidlogTown_House2.s"
+	.include "data/text/maps/PacifidlogTown_House3.s"
+	.include "data/text/maps/PacifidlogTown_House4.s"
+	.include "data/text/maps/PacifidlogTown_House5.s"
+	.include "data/text/maps/PetalburgCity_WallysHouse.s"
+	.include "data/text/maps/PetalburgCity_Gym.s"
+	.include "data/text/maps/PetalburgCity_House1.s"
+	.include "data/text/maps/PetalburgCity_House2.s"
+	.include "data/text/maps/PetalburgCity_PokemonCenter_1F.s"
+	.include "data/text/maps/PetalburgCity_Mart.s"
+	.include "data/text/maps/SlateportCity_SternsShipyard_1F.s"
+	.include "data/text/maps/SlateportCity_SternsShipyard_2F.s"
+	.include "data/text/maps/SlateportCity_ContestLobby.s"
+	.include "data/text/maps/SlateportCity_ContestHall.s"
+	.include "data/text/maps/SlateportCity_House1.s"
+	.include "data/text/maps/SlateportCity_PokemonFanClub.s"
+	.include "data/text/maps/SlateportCity_OceanicMuseum_1F.s"
+	.include "data/text/maps/SlateportCity_OceanicMuseum_2F.s"
+	.include "data/text/maps/SlateportCity_Harbor.s"
+	.include "data/text/maps/SlateportCity_House2.s"
+	.include "data/text/maps/SlateportCity_PokemonCenter_1F.s"
+	.include "data/text/maps/SlateportCity_Mart.s"
+	.include "data/text/maps/MauvilleCity_Gym.s"
+	.include "data/text/maps/MauvilleCity_BikeShop.s"
+	.include "data/text/maps/MauvilleCity_House1.s"
+	.include "data/text/maps/MauvilleCity_GameCorner.s"
+	.include "data/text/maps/MauvilleCity_House2.s"
+	.include "data/text/maps/MauvilleCity_PokemonCenter_1F.s"
+	.include "data/text/maps/MauvilleCity_PokemonCenter_2F.s"
+	.include "data/text/maps/MauvilleCity_Mart.s"
+	.include "data/text/maps/RustboroCity_DevonCorp_1F.s"
+	.include "data/text/maps/RustboroCity_DevonCorp_2F.s"
+	.include "data/text/maps/RustboroCity_DevonCorp_3F.s"
+	.include "data/text/maps/RustboroCity_Gym.s"
+	.include "data/text/maps/RustboroCity_PokemonSchool.s"
+	.include "data/text/maps/RustboroCity_PokemonCenter_1F.s"
+	.include "data/text/maps/RustboroCity_Mart.s"
+	.include "data/text/maps/RustboroCity_Flat1_1F.s"
+	.include "data/text/maps/RustboroCity_Flat1_2F.s"
+	.include "data/text/maps/RustboroCity_House1.s"
+	.include "data/text/maps/RustboroCity_CuttersHouse.s"
+	.include "data/text/maps/RustboroCity_House2.s"
+	.include "data/text/maps/RustboroCity_Flat2_1F.s"
+	.include "data/text/maps/RustboroCity_Flat2_2F.s"
+	.include "data/text/maps/RustboroCity_Flat2_3F.s"
+	.include "data/text/maps/RustboroCity_House3.s"
+	.include "data/text/maps/FortreeCity_House1.s"
+	.include "data/text/maps/FortreeCity_Gym.s"
+	.include "data/text/maps/FortreeCity_PokemonCenter_1F.s"
+	.include "data/text/maps/FortreeCity_Mart.s"
+	.include "data/text/maps/FortreeCity_House2.s"
+	.include "data/text/maps/FortreeCity_House3.s"
+	.include "data/text/maps/FortreeCity_House4.s"
+	.include "data/text/maps/FortreeCity_House5.s"
+	.include "data/text/maps/FortreeCity_DecorationShop.s"
+	.include "data/text/maps/LilycoveCity_CoveLilyMotel_1F.s"
+	.include "data/text/maps/LilycoveCity_CoveLilyMotel_2F.s"
+	.include "data/text/maps/LilycoveCity_LilycoveMuseum_1F.s"
+	.include "data/text/maps/LilycoveCity_LilycoveMuseum_2F.s"
+	.include "data/text/maps/LilycoveCity_ContestLobby.s"
+	.include "data/text/maps/LilycoveCity_ContestHall.s"
+	.include "data/text/maps/LilycoveCity_PokemonCenter_1F.s"
+	.include "data/text/maps/LilycoveCity_PokemonTrainerFanClub.s"
+	.include "data/text/maps/LilycoveCity_Harbor.s"
+	.include "data/text/maps/LilycoveCity_MoveDeletersHouse.s"
+	.include "data/text/maps/LilycoveCity_House1.s"
+	.include "data/text/maps/LilycoveCity_House2.s"
+	.include "data/text/maps/LilycoveCity_House3.s"
+	.include "data/text/maps/LilycoveCity_House4.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_1F.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_2F.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_3F.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_4F.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStore_5F.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStoreRooftop.s"
+	.include "data/text/maps/MossdeepCity_Gym.s"
+	.include "data/text/maps/MossdeepCity_House1.s"
+	.include "data/text/maps/MossdeepCity_House2.s"
+	.include "data/text/maps/MossdeepCity_PokemonCenter_1F.s"
+	.include "data/text/maps/MossdeepCity_PokemonCenter_2F.s"
+	.include "data/text/maps/MossdeepCity_Mart.s"
+	.include "data/text/maps/MossdeepCity_House3.s"
+	.include "data/text/maps/MossdeepCity_StevensHouse.s"
+	.include "data/text/maps/MossdeepCity_House4.s"
+	.include "data/text/maps/MossdeepCity_SpaceCenter_1F.s"
+	.include "data/text/maps/MossdeepCity_SpaceCenter_2F.s"
+	.include "data/text/maps/MossdeepCity_GameCorner_1F.s"
+	.include "data/text/maps/MossdeepCity_GameCorner_B1F.s"
+	.include "data/text/maps/SootopolisCity_Gym_1F.s"
+	.include "data/text/maps/SootopolisCity_Gym_B1F.s"
+	.include "data/text/maps/SootopolisCity_PokemonCenter_1F.s"
+	.include "data/text/maps/SootopolisCity_Mart.s"
+	.include "data/text/maps/SootopolisCity_House1.s"
+	.include "data/text/maps/SootopolisCity_House2.s"
+	.include "data/text/maps/SootopolisCity_House3.s"
+	.include "data/text/maps/SootopolisCity_House4.s"
+	.include "data/text/maps/SootopolisCity_House5.s"
+	.include "data/text/maps/SootopolisCity_House6.s"
+	.include "data/text/maps/SootopolisCity_House7.s"
+	.include "data/text/maps/SootopolisCity_House8.s"
+	.include "data/text/maps/EverGrandeCity_SidneysRoom.s"
+	.include "data/text/maps/EverGrandeCity_PhoebesRoom.s"
+	.include "data/text/maps/EverGrandeCity_GlaciasRoom.s"
+	.include "data/text/maps/EverGrandeCity_DrakesRoom.s"
+	.include "data/text/maps/EverGrandeCity_ChampionsRoom.s"
+	.include "data/text/maps/EverGrandeCity_PokemonLeague.s"
+	.include "data/text/maps/EverGrandeCity_HallOfFame.s"
+	.include "data/text/maps/EverGrandeCity_PokemonCenter_1F.s"
+	.include "data/text/maps/Route104_MrBrineysHouse.s"
+	.include "data/text/maps/Route111_WinstrateFamilysHouse.s"
+	.include "data/text/maps/Route111_OldLadysRestStop.s"
+	.include "data/text/maps/Route112_CableCarStation.s"
+	.include "data/text/maps/MtChimney_CableCarStation.s"
+	.include "data/text/maps/Route114_FossilManiacsHouse.s"
+	.include "data/text/maps/Route114_FossilManiacsTunnel.s"
+	.include "data/text/maps/Route114_LanettesHouse.s"
+	.include "data/text/maps/Route116_TunnelersRestHouse.s"
+	.include "data/text/maps/MeteorFalls_1F_1R.s"
+	.include "data/text/maps/MeteorFalls_1F_2R.s"
+	.include "data/text/maps/RusturfTunnel.s"
+	.include "data/text/maps/GraniteCave_1F.s"
+	.include "data/text/maps/GraniteCave_StevensRoom.s"
+	.include "data/text/maps/PetalburgWoods.s"
+	.include "data/text/maps/MtChimney.s"
+	.include "data/text/maps/JaggedPass.s"
+	.include "data/text/maps/MtPyre_1F.s"
+	.include "data/text/maps/MtPyre_2F.s"
+	.include "data/text/maps/MtPyre_3F.s"
+	.include "data/text/maps/MtPyre_4F.s"
+	.include "data/text/maps/MtPyre_5F.s"
+	.include "data/text/maps/MtPyre_6F.s"
+	.include "data/text/maps/AquaHideout_1F.s"
+	.include "data/text/maps/AquaHideout_B1F.s"
+	.include "data/text/maps/AquaHideout_B2F.s"
+	.include "data/text/maps/Underwater_SeafloorCavern.s"
+	.include "data/text/maps/SeafloorCavern_Room1.s"
+	.include "data/text/maps/SeafloorCavern_Room3.s"
+	.include "data/text/maps/SeafloorCavern_Room4.s"
+	.include "data/text/maps/VictoryRoad_1F.s"
+	.include "data/text/maps/VictoryRoad_B1F.s"
+	.include "data/text/maps/VictoryRoad_B2F.s"
+	.include "data/text/maps/ShoalCave_LowTideEntranceRoom.s"
+	.include "data/text/maps/ShoalCave_LowTideInnerRoom.s"
+	.include "data/text/maps/ShoalCave_LowTideStairsRoom.s"
+	.include "data/text/maps/ShoalCave_LowTideLowerRoom.s"
+	.include "data/text/maps/NewMauville_Entrance.s"
+	.include "data/text/maps/NewMauville_Inside.s"
+	.include "data/text/maps/AbandonedShip_Corridors_1F.s"
+	.include "data/text/maps/AbandonedShip_Rooms_1F.s"
+	.include "data/text/maps/AbandonedShip_Corridors_B1F.s"
+	.include "data/text/maps/AbandonedShip_HiddenFloorCorridors.s"
+	.include "data/text/maps/AbandonedShip_Rooms_B1F.s"
+	.include "data/text/maps/AbandonedShip_Rooms2_B1F.s"
+	.include "data/text/maps/AbandonedShip_Rooms2_1F.s"
+	.include "data/text/maps/AbandonedShip_CaptainsOffice.s"
+	.include "data/text/maps/AbandonedShip_HiddenFloorRooms.s"
+	.include "data/text/maps/SecretBase_RedCave1.s"
+	.include "data/text/maps/InsideOfTruck.s"
+	.include "data/text/maps/SSTidalCorridor.s"
+	.include "data/text/maps/SSTidalLowerDeck.s"
+	.include "data/text/maps/SSTidalRooms.s"
+	.include "data/text/maps/BattleTower_Outside.s"
+	.include "data/text/maps/BattleTower_Lobby.s"
+	.include "data/text/maps/BattleTower_BattleRoom.s"
+	.include "data/text/maps/SouthernIsland_Exterior.s"
+	.include "data/text/maps/SouthernIsland_Interior.s"
+	.include "data/text/maps/SafariZone_RestHouse.s"
+	.include "data/text/maps/Route104_Prototype.s"
+	.include "data/text/maps/Route104_PrototypePrettyPetalFlowerShop.s"
+	.include "data/text/maps/Route109_SeashoreHouse.s"
+	.include "data/text/maps/Route110_TrickHouseEntrance.s"
 
 Route110_TrickHousePuzzle1_Text_19C1B8:: @ 819C1B8
 	.string "{PLAYER} found a scroll.$"
@@ -862,23 +864,23 @@ UnknownString_819C21F: @ 819C21F
 	.string "...On closer inspection, this is written\n"
 	.string "on it: “Write the secret code here.”$"
 
-	.include "data/maps/text/Route110_TrickHouseEnd.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle1.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle2.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle3.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle4.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle5.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle6.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle7.s"
-	.include "data/maps/text/Route110_TrickHousePuzzle8.s"
-	.include "data/maps/text/Route110_SeasideCyclingRoadSouthEntrance.s"
-	.include "data/maps/text/Route110_SeasideCyclingRoadNorthEntrance.s"
-	.include "data/maps/text/Route113_GlassWorkshop.s"
-	.include "data/maps/text/Route123_BerryMastersHouse.s"
-	.include "data/maps/text/Route119_WeatherInstitute_1F.s"
-	.include "data/maps/text/Route119_WeatherInstitute_2F.s"
-	.include "data/maps/text/Route119_House.s"
-	.include "data/maps/text/Route124_DivingTreasureHuntersHouse.s"
+	.include "data/text/maps/Route110_TrickHouseEnd.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle1.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle2.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle3.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle4.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle5.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle6.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle7.s"
+	.include "data/text/maps/Route110_TrickHousePuzzle8.s"
+	.include "data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.s"
+	.include "data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.s"
+	.include "data/text/maps/Route113_GlassWorkshop.s"
+	.include "data/text/maps/Route123_BerryMastersHouse.s"
+	.include "data/text/maps/Route119_WeatherInstitute_1F.s"
+	.include "data/text/maps/Route119_WeatherInstitute_2F.s"
+	.include "data/text/maps/Route119_House.s"
+	.include "data/text/maps/Route124_DivingTreasureHuntersHouse.s"
 
 
 Std_2:
@@ -3022,7 +3024,7 @@ MauvilleCity_Mart_Text_1A0C02:: @ 81A0C02
 MossdeepCity_Mart_Text_1A0C02:: @ 81A0C02
 OldaleTown_Mart_Text_1A0C02:: @ 81A0C02
 PetalburgCity_Mart_Text_1A0C02:: @ 81A0C02
-	.include "data/maps/text/Route104_PrettyPetalFlowerShop.s"
+	.include "data/text/maps/Route104_PrettyPetalFlowerShop.s"
 RustboroCity_Mart_Text_1A0C02:: @ 81A0C02
 SlateportCity_Mart_Text_1A0C02:: @ 81A0C02
 SlateportCity_Text_1A0C02:: @ 81A0C02
@@ -3120,7 +3122,7 @@ UnknownString_81A0E68: @ 81A0E68
 UnknownString_81A0ED6: @ 81A0ED6
 	.string "What should I do for fun today?$"
 
-	.include "data/maps/text/LilycoveCity_DepartmentStoreElevator.s"
+	.include "data/text/maps/LilycoveCity_DepartmentStoreElevator.s"
 Route111_Text_1A0F93:: @ 81A0F93
 	.string "The sandstorm is vicious.\n"
 	.string "It’s impossible to keep going.$"
@@ -3187,12 +3189,12 @@ UseSurfPromptText: @ 81A1344
 UsedSurfText: @ 81A137D
 	.string "{STR_VAR_1} used SURF!$"
 
-	.include "data/maps/text/SealedChamber_InnerRoom.s"
-	.include "data/maps/text/AncientTomb.s"
-	.include "data/maps/text/DesertRuins.s"
-	.include "data/maps/text/IslandCave.s"
-	.include "data/maps/text/SealedChamber_OuterRoom.s"
-	.include "data/maps/text/OldaleTown_PokemonCenter_2F.s"
+	.include "data/text/maps/SealedChamber_InnerRoom.s"
+	.include "data/text/maps/AncientTomb.s"
+	.include "data/text/maps/DesertRuins.s"
+	.include "data/text/maps/IslandCave.s"
+	.include "data/text/maps/SealedChamber_OuterRoom.s"
+	.include "data/text/maps/OldaleTown_PokemonCenter_2F.s"
 FallarborTown_House1_Text_1A1498:: @ 81A1498
 	.string "{PLAYER} handed over the\n"
 	.string "{STR_VAR_1}.$"
@@ -5660,9 +5662,9 @@ UnknownString_81A4D45: @ 81A4D45
 	.string "Score! Got to look at {STR_VAR_1}’s\n"
 	.string "TRAINER CARD! It’s a {STR_VAR_2} card!$"
 
-	.include "data/maps/text/SingleBattleColosseum.s"
-	.include "data/maps/text/TradeCenter.s"
-	.include "data/maps/text/RecordCorner.s"
+	.include "data/text/maps/SingleBattleColosseum.s"
+	.include "data/text/maps/TradeCenter.s"
+	.include "data/text/maps/RecordCorner.s"
 OldaleTown_PokemonCenter_2F_Text_1A4E50:: @ 81A4E50
 	.string "The TRAINER CARD data will\n"
 	.string "be rewritten.$"
@@ -7160,7 +7162,7 @@ FallarborTown_ContestLobby_Text_1A68C6:: @ 81A68C6
 	.string "Please come back for your prize\n"
 	.string "later on.$"
 
-	.include "data/maps/text/LinkContestRoom1.s"
+	.include "data/text/maps/LinkContestRoom1.s"
 
 Event_TV:: @ 81A6E72
 	lockall
@@ -10922,7 +10924,7 @@ Route117_Text_1B28C4:: @ 81B28C4
 	.string "I really will keep it.\n"
 	.string "You do want this, yes?$"
 
-	.include "data/maps/text/Route117_PokemonDayCare.s"
+	.include "data/text/maps/Route117_PokemonDayCare.s"
 MtChimney_EventScript_1B2C95:: @ 81B2C95
 	lock
 	faceplayer
@@ -11407,9 +11409,9 @@ UnknownString_81B4818: @ 81B4818
 	.string "MAXIE: {PLAYER}{KUN}, come on, you have\n"
 	.string "to get out of here, too!$"
 
-	.include "data/maps/text/SeafloorCavern_Room9.s"
-	.include "data/maps/text/CaveOfOrigin_B4F.s"
-	.include "data/maps/text/MtPyre_Summit.s"
+	.include "data/text/maps/SeafloorCavern_Room9.s"
+	.include "data/text/maps/CaveOfOrigin_B4F.s"
+	.include "data/text/maps/MtPyre_Summit.s"
 
 gUnknown_081B694A:: @ 81B694A
 	lighten 1
@@ -12509,11 +12511,11 @@ UnknownString_81C35A9: @ 81C35A9
 	.string "The {STR_VAR_1} was placed\n"
 	.string "on the {POKEBLOCK} FEEDER.$"
 
-	.include "data/maps/text/Route121_SafariZoneEntrance.s"
-	.include "data/maps/text/SafariZone_Southeast.s"
-	.include "data/maps/text/SafariZone_Southwest.s"
-	.include "data/maps/text/SafariZone_Northwest.s"
-	.include "data/maps/text/SafariZone_Northeast.s"
+	.include "data/text/maps/Route121_SafariZoneEntrance.s"
+	.include "data/text/maps/SafariZone_Southeast.s"
+	.include "data/text/maps/SafariZone_Southwest.s"
+	.include "data/text/maps/SafariZone_Northwest.s"
+	.include "data/text/maps/SafariZone_Northeast.s"
 SafariZone_Southeast_Text_1C3DCE:: @ 81C3DCE
 	.string "I put a {POKEBLOCK} on the {POKEBLOCK} FEEDER.\n"
 	.string "But it seems to have disappeared.\p"
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.s b/data/maps/DewfordTown_PokemonCenter_1F/header.s
index ddc150385..79685a203 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/header.s
+++ b/data/maps/DewfordTown_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 DewfordTown_PokemonCenter_1F:: @ 8305B64
-	.4byte DewfordTown_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte DewfordTown_PokemonCenter_1F_MapEvents
 	.4byte DewfordTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.s b/data/maps/DewfordTown_PokemonCenter_2F/header.s
index e3571d5a0..a4849e0b9 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/header.s
+++ b/data/maps/DewfordTown_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 DewfordTown_PokemonCenter_2F:: @ 8305B80
-	.4byte DewfordTown_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte DewfordTown_PokemonCenter_2F_MapEvents
 	.4byte DewfordTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.s b/data/maps/EverGrandeCity_PokemonCenter_1F/header.s
index 20f21a1f5..fbd71fa4d 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.s
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 EverGrandeCity_PokemonCenter_1F:: @ 8306BE8
-	.4byte EverGrandeCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte EverGrandeCity_PokemonCenter_1F_MapEvents
 	.4byte EverGrandeCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.s b/data/maps/EverGrandeCity_PokemonCenter_2F/header.s
index ca689dff7..e27fc152c 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.s
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 EverGrandeCity_PokemonCenter_2F:: @ 8306C04
-	.4byte EverGrandeCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte EverGrandeCity_PokemonCenter_2F_MapEvents
 	.4byte EverGrandeCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FallarborTown_House1/header.s b/data/maps/FallarborTown_House1/header.s
index aa043f1a2..7f947fa01 100644
--- a/data/maps/FallarborTown_House1/header.s
+++ b/data/maps/FallarborTown_House1/header.s
@@ -1,5 +1,5 @@
 FallarborTown_House1:: @ 8305D40
-	.4byte FallarborTown_House1_MapAttributes
+	.4byte House1_MapAttributes
 	.4byte FallarborTown_House1_MapEvents
 	.4byte FallarborTown_House1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FallarborTown_House2/header.s b/data/maps/FallarborTown_House2/header.s
index 9058cb23f..fd490c482 100644
--- a/data/maps/FallarborTown_House2/header.s
+++ b/data/maps/FallarborTown_House2/header.s
@@ -1,5 +1,5 @@
 FallarborTown_House2:: @ 8305D5C
-	.4byte FallarborTown_House2_MapAttributes
+	.4byte House2_MapAttributes
 	.4byte FallarborTown_House2_MapEvents
 	.4byte FallarborTown_House2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FallarborTown_Mart/header.s b/data/maps/FallarborTown_Mart/header.s
index 43ea0cffa..6e6f49d1d 100644
--- a/data/maps/FallarborTown_Mart/header.s
+++ b/data/maps/FallarborTown_Mart/header.s
@@ -1,5 +1,5 @@
 FallarborTown_Mart:: @ 8305CB4
-	.4byte FallarborTown_Mart_MapAttributes
+	.4byte PokeMart_MapAttributes
 	.4byte FallarborTown_Mart_MapEvents
 	.4byte FallarborTown_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.s b/data/maps/FallarborTown_PokemonCenter_1F/header.s
index 2f0b0cdad..a7e4e23f6 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.s
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 FallarborTown_PokemonCenter_1F:: @ 8305D08
-	.4byte FallarborTown_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte FallarborTown_PokemonCenter_1F_MapEvents
 	.4byte FallarborTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.s b/data/maps/FallarborTown_PokemonCenter_2F/header.s
index abdac24dd..c168bf378 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/header.s
+++ b/data/maps/FallarborTown_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 FallarborTown_PokemonCenter_2F:: @ 8305D24
-	.4byte FallarborTown_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte FallarborTown_PokemonCenter_2F_MapEvents
 	.4byte FallarborTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FortreeCity_Mart/header.s b/data/maps/FortreeCity_Mart/header.s
index d334876da..c256f26fa 100644
--- a/data/maps/FortreeCity_Mart/header.s
+++ b/data/maps/FortreeCity_Mart/header.s
@@ -1,5 +1,5 @@
 FortreeCity_Mart:: @ 8306478
-	.4byte FortreeCity_Mart_MapAttributes
+	.4byte PokeMart_MapAttributes
 	.4byte FortreeCity_Mart_MapEvents
 	.4byte FortreeCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.s b/data/maps/FortreeCity_PokemonCenter_1F/header.s
index 82be5c3e6..8a854db7e 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/header.s
+++ b/data/maps/FortreeCity_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 FortreeCity_PokemonCenter_1F:: @ 8306440
-	.4byte FortreeCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte FortreeCity_PokemonCenter_1F_MapEvents
 	.4byte FortreeCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.s b/data/maps/FortreeCity_PokemonCenter_2F/header.s
index b0d529544..ff8f755be 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/header.s
+++ b/data/maps/FortreeCity_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 FortreeCity_PokemonCenter_2F:: @ 830645C
-	.4byte FortreeCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte FortreeCity_PokemonCenter_2F_MapEvents
 	.4byte FortreeCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/House1/border.bin b/data/maps/House1/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/House1/border.bin
diff --git a/data/maps/House1/map.bin b/data/maps/House1/map.bin
new file mode 100644
index 000000000..ea185484d
--- /dev/null
+++ b/data/maps/House1/map.bin
@@ -0,0 +1 @@
+��yz����


�2�2�2�2�2�2$2$2$2$2��9252626262626272#2#292=H6I6�2>2>2?2#2#292=P6Q6�2>2>2?2#2#292E2F2F2F2F2F2G2#2#292#2#2#2#2#2#2#2#2"292#2#2	#2#2#2#2*6
\ No newline at end of file
diff --git a/data/maps/House2/border.bin b/data/maps/House2/border.bin
new file mode 100644
index 000000000..f496f458e
--- /dev/null
+++ b/data/maps/House2/border.bin
diff --git a/data/maps/House2/map.bin b/data/maps/House2/map.bin
new file mode 100644
index 000000000..0e9f07964
--- /dev/null
+++ b/data/maps/House2/map.bin
@@ -0,0 +1 @@
+��0x��


hlm��2�282$2$2$2$2p2t2u2�292#2#2#2#2#2#2#2#2#2#292#2#2#2+2JK,2#2#2#292#2#2#2+2RS,2#2#2#2�2#2#2#2#2#2#2#2#2#2"2�#2#2	#2#2#2#2#2*
\ No newline at end of file
diff --git a/data/maps/LavaridgeTown_Mart/header.s b/data/maps/LavaridgeTown_Mart/header.s
index c2e8ba94d..a95261a76 100644
--- a/data/maps/LavaridgeTown_Mart/header.s
+++ b/data/maps/LavaridgeTown_Mart/header.s
@@ -1,5 +1,5 @@
 LavaridgeTown_Mart:: @ 8305C60
-	.4byte LavaridgeTown_Mart_MapAttributes
+	.4byte PokeMart_MapAttributes
 	.4byte LavaridgeTown_Mart_MapEvents
 	.4byte LavaridgeTown_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.s b/data/maps/LavaridgeTown_PokemonCenter_2F/header.s
index ee01816cc..f717ba1f3 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.s
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 LavaridgeTown_PokemonCenter_2F:: @ 8305C98
-	.4byte LavaridgeTown_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte LavaridgeTown_PokemonCenter_2F_MapEvents
 	.4byte LavaridgeTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_House1/header.s b/data/maps/LilycoveCity_House1/header.s
index 1654d5bae..dd24c5902 100644
--- a/data/maps/LilycoveCity_House1/header.s
+++ b/data/maps/LilycoveCity_House1/header.s
@@ -1,5 +1,5 @@
 LilycoveCity_House1:: @ 830668C
-	.4byte LilycoveCity_House1_MapAttributes
+	.4byte House1_MapAttributes
 	.4byte LilycoveCity_House1_MapEvents
 	.4byte LilycoveCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_House3/header.s b/data/maps/LilycoveCity_House3/header.s
index a3f1310b2..d2bba39d2 100644
--- a/data/maps/LilycoveCity_House3/header.s
+++ b/data/maps/LilycoveCity_House3/header.s
@@ -1,5 +1,5 @@
 LilycoveCity_House3:: @ 83066C4
-	.4byte LilycoveCity_House3_MapAttributes
+	.4byte House2_MapAttributes
 	.4byte LilycoveCity_House3_MapEvents
 	.4byte LilycoveCity_House3_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_House4/header.s b/data/maps/LilycoveCity_House4/header.s
index ed0cfed66..32dc22b4e 100644
--- a/data/maps/LilycoveCity_House4/header.s
+++ b/data/maps/LilycoveCity_House4/header.s
@@ -1,5 +1,5 @@
 LilycoveCity_House4:: @ 83066E0
-	.4byte LilycoveCity_House4_MapAttributes
+	.4byte House1_MapAttributes
 	.4byte LilycoveCity_House4_MapEvents
 	.4byte LilycoveCity_House4_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.s b/data/maps/LilycoveCity_MoveDeletersHouse/header.s
index cabf8d4ee..749e90a72 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/header.s
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.s
@@ -1,5 +1,5 @@
 LilycoveCity_MoveDeletersHouse:: @ 8306670
-	.4byte LilycoveCity_MoveDeletersHouse_MapAttributes
+	.4byte House2_MapAttributes
 	.4byte LilycoveCity_MoveDeletersHouse_MapEvents
 	.4byte LilycoveCity_MoveDeletersHouse_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.s b/data/maps/LilycoveCity_PokemonCenter_1F/header.s
index 155d8a611..47fd186b2 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/header.s
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 LilycoveCity_PokemonCenter_1F:: @ 83065C8
-	.4byte LilycoveCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte LilycoveCity_PokemonCenter_1F_MapEvents
 	.4byte LilycoveCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.s b/data/maps/LilycoveCity_PokemonCenter_2F/header.s
index d7e073023..a30735e68 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/header.s
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 LilycoveCity_PokemonCenter_2F:: @ 83065E4
-	.4byte LilycoveCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte LilycoveCity_PokemonCenter_2F_MapEvents
 	.4byte LilycoveCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/LilycoveCity_UnusedMart/header.s b/data/maps/LilycoveCity_UnusedMart/header.s
index 221fac730..8fa55998c 100644
--- a/data/maps/LilycoveCity_UnusedMart/header.s
+++ b/data/maps/LilycoveCity_UnusedMart/header.s
@@ -1,5 +1,5 @@
 LilycoveCity_UnusedMart:: @ 8306600
-	.4byte LilycoveCity_UnusedMart_MapAttributes
+	.4byte PokeMart_MapAttributes
 	.4byte LilycoveCity_UnusedMart_MapEvents
 	.4byte LilycoveCity_UnusedMart_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MauvilleCity_House1/header.s b/data/maps/MauvilleCity_House1/header.s
index 786b0aadf..ed2d2ba7e 100644
--- a/data/maps/MauvilleCity_House1/header.s
+++ b/data/maps/MauvilleCity_House1/header.s
@@ -1,5 +1,5 @@
 MauvilleCity_House1:: @ 8306184
-	.4byte MauvilleCity_House1_MapAttributes
+	.4byte House2_MapAttributes
 	.4byte MauvilleCity_House1_MapEvents
 	.4byte MauvilleCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MauvilleCity_House2/header.s b/data/maps/MauvilleCity_House2/header.s
index b5d079c2c..2b89cee19 100644
--- a/data/maps/MauvilleCity_House2/header.s
+++ b/data/maps/MauvilleCity_House2/header.s
@@ -1,5 +1,5 @@
 MauvilleCity_House2:: @ 83061BC
-	.4byte MauvilleCity_House2_MapAttributes
+	.4byte House1_MapAttributes
 	.4byte MauvilleCity_House2_MapEvents
 	.4byte MauvilleCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MauvilleCity_Mart/header.s b/data/maps/MauvilleCity_Mart/header.s
index a83f5106f..1a412241e 100644
--- a/data/maps/MauvilleCity_Mart/header.s
+++ b/data/maps/MauvilleCity_Mart/header.s
@@ -1,5 +1,5 @@
 MauvilleCity_Mart:: @ 8306210
-	.4byte MauvilleCity_Mart_MapAttributes
+	.4byte PokeMart_MapAttributes
 	.4byte MauvilleCity_Mart_MapEvents
 	.4byte MauvilleCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.s b/data/maps/MauvilleCity_PokemonCenter_1F/header.s
index dd8dae9eb..ae3f11efd 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/header.s
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 MauvilleCity_PokemonCenter_1F:: @ 83061D8
-	.4byte MauvilleCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte MauvilleCity_PokemonCenter_1F_MapEvents
 	.4byte MauvilleCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.s b/data/maps/MauvilleCity_PokemonCenter_2F/header.s
index 40800a47a..6b192ed69 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/header.s
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 MauvilleCity_PokemonCenter_2F:: @ 83061F4
-	.4byte MauvilleCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte MauvilleCity_PokemonCenter_2F_MapEvents
 	.4byte MauvilleCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MossdeepCity_House1/header.s b/data/maps/MossdeepCity_House1/header.s
index fd3395b16..0ea5853d9 100644
--- a/data/maps/MossdeepCity_House1/header.s
+++ b/data/maps/MossdeepCity_House1/header.s
@@ -1,5 +1,5 @@
 MossdeepCity_House1:: @ 83067DC
-	.4byte MossdeepCity_House1_MapAttributes
+	.4byte House2_MapAttributes
 	.4byte MossdeepCity_House1_MapEvents
 	.4byte MossdeepCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MossdeepCity_House2/header.s b/data/maps/MossdeepCity_House2/header.s
index a5078fba3..66a6e57d8 100644
--- a/data/maps/MossdeepCity_House2/header.s
+++ b/data/maps/MossdeepCity_House2/header.s
@@ -1,5 +1,5 @@
 MossdeepCity_House2:: @ 83067F8
-	.4byte MossdeepCity_House2_MapAttributes
+	.4byte House1_MapAttributes
 	.4byte MossdeepCity_House2_MapEvents
 	.4byte MossdeepCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MossdeepCity_House3/header.s b/data/maps/MossdeepCity_House3/header.s
index 39c394b57..c6cc3ccf8 100644
--- a/data/maps/MossdeepCity_House3/header.s
+++ b/data/maps/MossdeepCity_House3/header.s
@@ -1,5 +1,5 @@
 MossdeepCity_House3:: @ 8306868
-	.4byte MossdeepCity_House3_MapAttributes
+	.4byte House2_MapAttributes
 	.4byte MossdeepCity_House3_MapEvents
 	.4byte MossdeepCity_House3_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MossdeepCity_Mart/header.s b/data/maps/MossdeepCity_Mart/header.s
index 4b3d0a8e9..d7097b352 100644
--- a/data/maps/MossdeepCity_Mart/header.s
+++ b/data/maps/MossdeepCity_Mart/header.s
@@ -1,5 +1,5 @@
 MossdeepCity_Mart:: @ 830684C
-	.4byte MossdeepCity_Mart_MapAttributes
+	.4byte PokeMart_MapAttributes
 	.4byte MossdeepCity_Mart_MapEvents
 	.4byte MossdeepCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.s b/data/maps/MossdeepCity_PokemonCenter_1F/header.s
index 1dd52ebe2..5a7fa318b 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/header.s
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 MossdeepCity_PokemonCenter_1F:: @ 8306814
-	.4byte MossdeepCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte MossdeepCity_PokemonCenter_1F_MapEvents
 	.4byte MossdeepCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.s b/data/maps/MossdeepCity_PokemonCenter_2F/header.s
index 0dc2c58f5..8ac7f129a 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/header.s
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 MossdeepCity_PokemonCenter_2F:: @ 8306830
-	.4byte MossdeepCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte MossdeepCity_PokemonCenter_2F_MapEvents
 	.4byte MossdeepCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/OldaleTown_House1/header.s b/data/maps/OldaleTown_House1/header.s
index f23b9b097..f5d370d01 100644
--- a/data/maps/OldaleTown_House1/header.s
+++ b/data/maps/OldaleTown_House1/header.s
@@ -1,5 +1,5 @@
 OldaleTown_House1:: @ 8305ABC
-	.4byte OldaleTown_House1_MapAttributes
+	.4byte House1_MapAttributes
 	.4byte OldaleTown_House1_MapEvents
 	.4byte OldaleTown_House1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/OldaleTown_House2/header.s b/data/maps/OldaleTown_House2/header.s
index 44f67bca0..8676d967d 100644
--- a/data/maps/OldaleTown_House2/header.s
+++ b/data/maps/OldaleTown_House2/header.s
@@ -1,5 +1,5 @@
 OldaleTown_House2:: @ 8305AD8
-	.4byte OldaleTown_House2_MapAttributes
+	.4byte House2_MapAttributes
 	.4byte OldaleTown_House2_MapEvents
 	.4byte OldaleTown_House2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/OldaleTown_Mart/header.s b/data/maps/OldaleTown_Mart/header.s
index 7c9ed4c62..b8b6a7685 100644
--- a/data/maps/OldaleTown_Mart/header.s
+++ b/data/maps/OldaleTown_Mart/header.s
@@ -1,5 +1,5 @@
 OldaleTown_Mart:: @ 8305B2C
-	.4byte OldaleTown_Mart_MapAttributes
+	.4byte PokeMart_MapAttributes
 	.4byte OldaleTown_Mart_MapEvents
 	.4byte OldaleTown_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.s b/data/maps/OldaleTown_PokemonCenter_1F/header.s
index 1e7904ac8..e112c3f22 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/header.s
+++ b/data/maps/OldaleTown_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 OldaleTown_PokemonCenter_1F:: @ 8305AF4
-	.4byte OldaleTown_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte OldaleTown_PokemonCenter_1F_MapEvents
 	.4byte OldaleTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.s b/data/maps/OldaleTown_PokemonCenter_2F/header.s
index 14a93944f..b0a13038b 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/header.s
+++ b/data/maps/OldaleTown_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 OldaleTown_PokemonCenter_2F:: @ 8305B10
-	.4byte OldaleTown_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte OldaleTown_PokemonCenter_2F_MapEvents
 	.4byte OldaleTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.s b/data/maps/PacifidlogTown_PokemonCenter_1F/header.s
index 1f23e60e3..141e95a10 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.s
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 PacifidlogTown_PokemonCenter_1F:: @ 8305E58
-	.4byte PacifidlogTown_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte PacifidlogTown_PokemonCenter_1F_MapEvents
 	.4byte PacifidlogTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.s b/data/maps/PacifidlogTown_PokemonCenter_2F/header.s
index d9f3a9da9..6f26cec35 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.s
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 PacifidlogTown_PokemonCenter_2F:: @ 8305E74
-	.4byte PacifidlogTown_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte PacifidlogTown_PokemonCenter_2F_MapEvents
 	.4byte PacifidlogTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/PetalburgCity_House1/header.s b/data/maps/PetalburgCity_House1/header.s
index 7b937d13c..5139f7773 100644
--- a/data/maps/PetalburgCity_House1/header.s
+++ b/data/maps/PetalburgCity_House1/header.s
@@ -1,5 +1,5 @@
 PetalburgCity_House1:: @ 8305F54
-	.4byte PetalburgCity_House1_MapAttributes
+	.4byte House1_MapAttributes
 	.4byte PetalburgCity_House1_MapEvents
 	.4byte PetalburgCity_House1_MapScripts
 	.4byte 0x0
diff --git a/data/maps/PetalburgCity_Mart/header.s b/data/maps/PetalburgCity_Mart/header.s
index 442adfaae..bda37818a 100644
--- a/data/maps/PetalburgCity_Mart/header.s
+++ b/data/maps/PetalburgCity_Mart/header.s
@@ -1,5 +1,5 @@
 PetalburgCity_Mart:: @ 8305FC4
-	.4byte PetalburgCity_Mart_MapAttributes
+	.4byte PokeMart_MapAttributes
 	.4byte PetalburgCity_Mart_MapEvents
 	.4byte PetalburgCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.s b/data/maps/PetalburgCity_PokemonCenter_1F/header.s
index fe7e2fe2b..019057eb8 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/header.s
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 PetalburgCity_PokemonCenter_1F:: @ 8305F8C
-	.4byte PetalburgCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte PetalburgCity_PokemonCenter_1F_MapEvents
 	.4byte PetalburgCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.s b/data/maps/PetalburgCity_PokemonCenter_2F/header.s
index dd489051a..cd1879ee6 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/header.s
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 PetalburgCity_PokemonCenter_2F:: @ 8305FA8
-	.4byte PetalburgCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte PetalburgCity_PokemonCenter_2F_MapEvents
 	.4byte PetalburgCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/PetalburgCity_WallysHouse/header.s b/data/maps/PetalburgCity_WallysHouse/header.s
index 067fc6911..5619eecf6 100644
--- a/data/maps/PetalburgCity_WallysHouse/header.s
+++ b/data/maps/PetalburgCity_WallysHouse/header.s
@@ -1,5 +1,5 @@
 PetalburgCity_WallysHouse:: @ 8305F1C
-	.4byte PetalburgCity_WallysHouse_MapAttributes
+	.4byte House2_MapAttributes
 	.4byte PetalburgCity_WallysHouse_MapEvents
 	.4byte PetalburgCity_WallysHouse_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.s b/data/maps/Route111_WinstrateFamilysHouse/header.s
index 15044ba0f..8192749e3 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/header.s
+++ b/data/maps/Route111_WinstrateFamilysHouse/header.s
@@ -1,5 +1,5 @@
 Route111_WinstrateFamilysHouse:: @ 8306C58
-	.4byte Route111_WinstrateFamilysHouse_MapAttributes
+	.4byte House2_MapAttributes
 	.4byte Route111_WinstrateFamilysHouse_MapEvents
 	.4byte Route111_WinstrateFamilysHouse_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route119_House/header.s b/data/maps/Route119_House/header.s
index 9516f4b89..9951fca69 100644
--- a/data/maps/Route119_House/header.s
+++ b/data/maps/Route119_House/header.s
@@ -1,5 +1,5 @@
 Route119_House:: @ 8307F28
-	.4byte Route119_House_MapAttributes
+	.4byte House1_MapAttributes
 	.4byte Route119_House_MapEvents
 	.4byte Route119_House_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route123_BerryMastersHouse/header.s b/data/maps/Route123_BerryMastersHouse/header.s
index 14620f51d..6c9caf4d9 100644
--- a/data/maps/Route123_BerryMastersHouse/header.s
+++ b/data/maps/Route123_BerryMastersHouse/header.s
@@ -1,5 +1,5 @@
 Route123_BerryMastersHouse:: @ 8307ED4
-	.4byte Route123_BerryMastersHouse_MapAttributes
+	.4byte House2_MapAttributes
 	.4byte Route123_BerryMastersHouse_MapEvents
 	.4byte Route123_BerryMastersHouse_MapScripts
 	.4byte 0x0
diff --git a/data/maps/RustboroCity_Mart/header.s b/data/maps/RustboroCity_Mart/header.s
index 59be293a8..94655edc7 100644
--- a/data/maps/RustboroCity_Mart/header.s
+++ b/data/maps/RustboroCity_Mart/header.s
@@ -1,5 +1,5 @@
 RustboroCity_Mart:: @ 83062F0
-	.4byte RustboroCity_Mart_MapAttributes
+	.4byte PokeMart_MapAttributes
 	.4byte RustboroCity_Mart_MapEvents
 	.4byte RustboroCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.s b/data/maps/RustboroCity_PokemonCenter_1F/header.s
index 38c4af614..a59009266 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.s
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 RustboroCity_PokemonCenter_1F:: @ 83062B8
-	.4byte RustboroCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte RustboroCity_PokemonCenter_1F_MapEvents
 	.4byte RustboroCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.s b/data/maps/RustboroCity_PokemonCenter_2F/header.s
index 8b6b3af7d..1ed59b227 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/header.s
+++ b/data/maps/RustboroCity_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 RustboroCity_PokemonCenter_2F:: @ 83062D4
-	.4byte RustboroCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte RustboroCity_PokemonCenter_2F_MapEvents
 	.4byte RustboroCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SlateportCity_House2/header.s b/data/maps/SlateportCity_House2/header.s
index 5841ccc7e..730fb9ec1 100644
--- a/data/maps/SlateportCity_House2/header.s
+++ b/data/maps/SlateportCity_House2/header.s
@@ -1,5 +1,5 @@
 SlateportCity_House2:: @ 83060DC
-	.4byte SlateportCity_House2_MapAttributes
+	.4byte House2_MapAttributes
 	.4byte SlateportCity_House2_MapEvents
 	.4byte SlateportCity_House2_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SlateportCity_Mart/header.s b/data/maps/SlateportCity_Mart/header.s
index 686f90274..33d746d81 100644
--- a/data/maps/SlateportCity_Mart/header.s
+++ b/data/maps/SlateportCity_Mart/header.s
@@ -1,5 +1,5 @@
 SlateportCity_Mart:: @ 8306130
-	.4byte SlateportCity_Mart_MapAttributes
+	.4byte PokeMart_MapAttributes
 	.4byte SlateportCity_Mart_MapEvents
 	.4byte SlateportCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.s b/data/maps/SlateportCity_PokemonCenter_1F/header.s
index 99c3a51cd..411260dc8 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/header.s
+++ b/data/maps/SlateportCity_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 SlateportCity_PokemonCenter_1F:: @ 83060F8
-	.4byte SlateportCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte SlateportCity_PokemonCenter_1F_MapEvents
 	.4byte SlateportCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.s b/data/maps/SlateportCity_PokemonCenter_2F/header.s
index 5cd989918..00172d0f9 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/header.s
+++ b/data/maps/SlateportCity_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 SlateportCity_PokemonCenter_2F:: @ 8306114
-	.4byte SlateportCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte SlateportCity_PokemonCenter_2F_MapEvents
 	.4byte SlateportCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SootopolisCity_Mart/header.s b/data/maps/SootopolisCity_Mart/header.s
index 9ce2c4f63..737b1e315 100644
--- a/data/maps/SootopolisCity_Mart/header.s
+++ b/data/maps/SootopolisCity_Mart/header.s
@@ -1,5 +1,5 @@
 SootopolisCity_Mart:: @ 830699C
-	.4byte SootopolisCity_Mart_MapAttributes
+	.4byte PokeMart_MapAttributes
 	.4byte SootopolisCity_Mart_MapEvents
 	.4byte SootopolisCity_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.s b/data/maps/SootopolisCity_PokemonCenter_1F/header.s
index be57b9c0e..e984a7058 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/header.s
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 SootopolisCity_PokemonCenter_1F:: @ 8306964
-	.4byte SootopolisCity_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte SootopolisCity_PokemonCenter_1F_MapEvents
 	.4byte SootopolisCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.s b/data/maps/SootopolisCity_PokemonCenter_2F/header.s
index 267771372..04ea7184c 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/header.s
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 SootopolisCity_PokemonCenter_2F:: @ 8306980
-	.4byte SootopolisCity_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte SootopolisCity_PokemonCenter_2F_MapEvents
 	.4byte SootopolisCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s
index 6db80f2dc..8b7040e9f 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.s
@@ -1,5 +1,5 @@
 VerdanturfTown_FriendshipRatersHouse:: @ 8305E20
-	.4byte VerdanturfTown_FriendshipRatersHouse_MapAttributes
+	.4byte House2_MapAttributes
 	.4byte VerdanturfTown_FriendshipRatersHouse_MapEvents
 	.4byte VerdanturfTown_FriendshipRatersHouse_MapScripts
 	.4byte 0x0
diff --git a/data/maps/VerdanturfTown_House/header.s b/data/maps/VerdanturfTown_House/header.s
index 0a0aed8df..d6c0aa37c 100644
--- a/data/maps/VerdanturfTown_House/header.s
+++ b/data/maps/VerdanturfTown_House/header.s
@@ -1,5 +1,5 @@
 VerdanturfTown_House:: @ 8305E3C
-	.4byte VerdanturfTown_House_MapAttributes
+	.4byte House1_MapAttributes
 	.4byte VerdanturfTown_House_MapEvents
 	.4byte VerdanturfTown_House_MapScripts
 	.4byte 0x0
diff --git a/data/maps/VerdanturfTown_Mart/header.s b/data/maps/VerdanturfTown_Mart/header.s
index e73df9a3b..bea481cc0 100644
--- a/data/maps/VerdanturfTown_Mart/header.s
+++ b/data/maps/VerdanturfTown_Mart/header.s
@@ -1,5 +1,5 @@
 VerdanturfTown_Mart:: @ 8305DB0
-	.4byte VerdanturfTown_Mart_MapAttributes
+	.4byte PokeMart_MapAttributes
 	.4byte VerdanturfTown_Mart_MapEvents
 	.4byte VerdanturfTown_Mart_MapScripts
 	.4byte 0x0
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.s b/data/maps/VerdanturfTown_PokemonCenter_1F/header.s
index 3ec212117..e77090aa4 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.s
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.s
@@ -1,5 +1,5 @@
 VerdanturfTown_PokemonCenter_1F:: @ 8305DCC
-	.4byte VerdanturfTown_PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_MapAttributes
 	.4byte VerdanturfTown_PokemonCenter_1F_MapEvents
 	.4byte VerdanturfTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.s b/data/maps/VerdanturfTown_PokemonCenter_2F/header.s
index a4f35498f..d3550c240 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.s
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.s
@@ -1,5 +1,5 @@
 VerdanturfTown_PokemonCenter_2F:: @ 8305DE8
-	.4byte VerdanturfTown_PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_MapAttributes
 	.4byte VerdanturfTown_PokemonCenter_2F_MapEvents
 	.4byte VerdanturfTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/_assets.s b/data/maps/_assets.s
index 2f2655b1c..1297bbd69 100644
--- a/data/maps/_assets.s
+++ b/data/maps/_assets.s
@@ -4,13 +4,14 @@ PetalburgCity_MapBorder:: @ 8287264
 PetalburgCity_MapBlockdata:: @ 828726C
 	.incbin "data/maps/PetalburgCity/map.bin"
 
+	.align 2
 PetalburgCity_MapAttributes:: @ 8287974
 	.4byte 0x1e
 	.4byte 0x1e
 	.4byte PetalburgCity_MapBorder
 	.4byte PetalburgCity_MapBlockdata
-	.4byte PetalburgCity_Tileset
-	.4byte PetalburgCity_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
 
 SlateportCity_MapBorder:: @ 828798C
 	.incbin "data/maps/SlateportCity/border.bin"
@@ -18,13 +19,14 @@ SlateportCity_MapBorder:: @ 828798C
 SlateportCity_MapBlockdata:: @ 8287994
 	.incbin "data/maps/SlateportCity/map.bin"
 
+	.align 2
 SlateportCity_MapAttributes:: @ 8288C54
 	.4byte 0x28
 	.4byte 0x3c
 	.4byte SlateportCity_MapBorder
 	.4byte SlateportCity_MapBlockdata
-	.4byte SlateportCity_Tileset
-	.4byte SlateportCity_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Slateport
 
 MauvilleCity_MapBorder:: @ 8288C6C
 	.incbin "data/maps/MauvilleCity/border.bin"
@@ -32,13 +34,14 @@ MauvilleCity_MapBorder:: @ 8288C6C
 MauvilleCity_MapBlockdata:: @ 8288C74
 	.incbin "data/maps/MauvilleCity/map.bin"
 
+	.align 2
 MauvilleCity_MapAttributes:: @ 82892B4
 	.4byte 0x28
 	.4byte 0x14
 	.4byte MauvilleCity_MapBorder
 	.4byte MauvilleCity_MapBlockdata
-	.4byte MauvilleCity_Tileset
-	.4byte MauvilleCity_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
 
 RustboroCity_MapBorder:: @ 82892CC
 	.incbin "data/maps/RustboroCity/border.bin"
@@ -46,13 +49,14 @@ RustboroCity_MapBorder:: @ 82892CC
 RustboroCity_MapBlockdata:: @ 82892D4
 	.incbin "data/maps/RustboroCity/map.bin"
 
+	.align 2
 RustboroCity_MapAttributes:: @ 828A594
 	.4byte 0x28
 	.4byte 0x3c
 	.4byte RustboroCity_MapBorder
 	.4byte RustboroCity_MapBlockdata
-	.4byte RustboroCity_Tileset
-	.4byte RustboroCity_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
 
 FortreeCity_MapBorder:: @ 828A5AC
 	.incbin "data/maps/FortreeCity/border.bin"
@@ -60,13 +64,14 @@ FortreeCity_MapBorder:: @ 828A5AC
 FortreeCity_MapBlockdata:: @ 828A5B4
 	.incbin "data/maps/FortreeCity/map.bin"
 
+	.align 2
 FortreeCity_MapAttributes:: @ 828ABF4
 	.4byte 0x28
 	.4byte 0x14
 	.4byte FortreeCity_MapBorder
 	.4byte FortreeCity_MapBlockdata
-	.4byte FortreeCity_Tileset
-	.4byte FortreeCity_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Fortree
 
 LilycoveCity_MapBorder:: @ 828AC0C
 	.incbin "data/maps/LilycoveCity/border.bin"
@@ -74,13 +79,14 @@ LilycoveCity_MapBorder:: @ 828AC0C
 LilycoveCity_MapBlockdata:: @ 828AC14
 	.incbin "data/maps/LilycoveCity/map.bin"
 
+	.align 2
 LilycoveCity_MapAttributes:: @ 828C514
 	.4byte 0x50
 	.4byte 0x28
 	.4byte LilycoveCity_MapBorder
 	.4byte LilycoveCity_MapBlockdata
-	.4byte LilycoveCity_Tileset
-	.4byte LilycoveCity_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
 
 MossdeepCity_MapBorder:: @ 828C52C
 	.incbin "data/maps/MossdeepCity/border.bin"
@@ -88,13 +94,14 @@ MossdeepCity_MapBorder:: @ 828C52C
 MossdeepCity_MapBlockdata:: @ 828C534
 	.incbin "data/maps/MossdeepCity/map.bin"
 
+	.align 2
 MossdeepCity_MapAttributes:: @ 828DE34
 	.4byte 0x50
 	.4byte 0x28
 	.4byte MossdeepCity_MapBorder
 	.4byte MossdeepCity_MapBlockdata
-	.4byte MossdeepCity_Tileset
-	.4byte MossdeepCity_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
 
 SootopolisCity_MapBorder:: @ 828DE4C
 	.incbin "data/maps/SootopolisCity/border.bin"
@@ -102,13 +109,14 @@ SootopolisCity_MapBorder:: @ 828DE4C
 SootopolisCity_MapBlockdata:: @ 828DE54
 	.incbin "data/maps/SootopolisCity/map.bin"
 
+	.align 2
 SootopolisCity_MapAttributes:: @ 828FA74
 	.4byte 0x3c
 	.4byte 0x3c
 	.4byte SootopolisCity_MapBorder
 	.4byte SootopolisCity_MapBlockdata
-	.4byte SootopolisCity_Tileset
-	.4byte SootopolisCity_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Sootopolis
 
 EverGrandeCity_MapBorder:: @ 828FA8C
 	.incbin "data/maps/EverGrandeCity/border.bin"
@@ -116,13 +124,14 @@ EverGrandeCity_MapBorder:: @ 828FA8C
 EverGrandeCity_MapBlockdata:: @ 828FA94
 	.incbin "data/maps/EverGrandeCity/map.bin"
 
+	.align 2
 EverGrandeCity_MapAttributes:: @ 8291394
 	.4byte 0x28
 	.4byte 0x50
 	.4byte EverGrandeCity_MapBorder
 	.4byte EverGrandeCity_MapBlockdata
-	.4byte EverGrandeCity_Tileset
-	.4byte EverGrandeCity_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_EverGrande
 
 LittlerootTown_MapBorder:: @ 82913AC
 	.incbin "data/maps/LittlerootTown/border.bin"
@@ -130,13 +139,14 @@ LittlerootTown_MapBorder:: @ 82913AC
 LittlerootTown_MapBlockdata:: @ 82913B4
 	.incbin "data/maps/LittlerootTown/map.bin"
 
+	.align 2
 LittlerootTown_MapAttributes:: @ 82916D4
 	.4byte 0x14
 	.4byte 0x14
 	.4byte LittlerootTown_MapBorder
 	.4byte LittlerootTown_MapBlockdata
-	.4byte LittlerootTown_Tileset
-	.4byte LittlerootTown_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
 
 OldaleTown_MapBorder:: @ 82916EC
 	.incbin "data/maps/OldaleTown/border.bin"
@@ -144,13 +154,14 @@ OldaleTown_MapBorder:: @ 82916EC
 OldaleTown_MapBlockdata:: @ 82916F4
 	.incbin "data/maps/OldaleTown/map.bin"
 
+	.align 2
 OldaleTown_MapAttributes:: @ 8291A14
 	.4byte 0x14
 	.4byte 0x14
 	.4byte OldaleTown_MapBorder
 	.4byte OldaleTown_MapBlockdata
-	.4byte OldaleTown_Tileset
-	.4byte OldaleTown_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
 
 DewfordTown_MapBorder:: @ 8291A2C
 	.incbin "data/maps/DewfordTown/border.bin"
@@ -158,13 +169,14 @@ DewfordTown_MapBorder:: @ 8291A2C
 DewfordTown_MapBlockdata:: @ 8291A34
 	.incbin "data/maps/DewfordTown/map.bin"
 
+	.align 2
 DewfordTown_MapAttributes:: @ 8291D54
 	.4byte 0x14
 	.4byte 0x14
 	.4byte DewfordTown_MapBorder
 	.4byte DewfordTown_MapBlockdata
-	.4byte DewfordTown_Tileset
-	.4byte DewfordTown_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
 
 LavaridgeTown_MapBorder:: @ 8291D6C
 	.incbin "data/maps/LavaridgeTown/border.bin"
@@ -172,13 +184,14 @@ LavaridgeTown_MapBorder:: @ 8291D6C
 LavaridgeTown_MapBlockdata:: @ 8291D74
 	.incbin "data/maps/LavaridgeTown/map.bin"
 
+	.align 2
 LavaridgeTown_MapAttributes:: @ 8292094
 	.4byte 0x14
 	.4byte 0x14
 	.4byte LavaridgeTown_MapBorder
 	.4byte LavaridgeTown_MapBlockdata
-	.4byte LavaridgeTown_Tileset
-	.4byte LavaridgeTown_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
 
 FallarborTown_MapBorder:: @ 82920AC
 	.incbin "data/maps/FallarborTown/border.bin"
@@ -186,13 +199,14 @@ FallarborTown_MapBorder:: @ 82920AC
 FallarborTown_MapBlockdata:: @ 82920B4
 	.incbin "data/maps/FallarborTown/map.bin"
 
+	.align 2
 FallarborTown_MapAttributes:: @ 82923D4
 	.4byte 0x14
 	.4byte 0x14
 	.4byte FallarborTown_MapBorder
 	.4byte FallarborTown_MapBlockdata
-	.4byte FallarborTown_Tileset
-	.4byte FallarborTown_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
 
 VerdanturfTown_MapBorder:: @ 82923EC
 	.incbin "data/maps/VerdanturfTown/border.bin"
@@ -200,13 +214,14 @@ VerdanturfTown_MapBorder:: @ 82923EC
 VerdanturfTown_MapBlockdata:: @ 82923F4
 	.incbin "data/maps/VerdanturfTown/map.bin"
 
+	.align 2
 VerdanturfTown_MapAttributes:: @ 8292714
 	.4byte 0x14
 	.4byte 0x14
 	.4byte VerdanturfTown_MapBorder
 	.4byte VerdanturfTown_MapBlockdata
-	.4byte VerdanturfTown_Tileset
-	.4byte VerdanturfTown_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
 
 PacifidlogTown_MapBorder:: @ 829272C
 	.incbin "data/maps/PacifidlogTown/border.bin"
@@ -214,13 +229,14 @@ PacifidlogTown_MapBorder:: @ 829272C
 PacifidlogTown_MapBlockdata:: @ 8292734
 	.incbin "data/maps/PacifidlogTown/map.bin"
 
+	.align 2
 PacifidlogTown_MapAttributes:: @ 8292D74
 	.4byte 0x14
 	.4byte 0x28
 	.4byte PacifidlogTown_MapBorder
 	.4byte PacifidlogTown_MapBlockdata
-	.4byte PacifidlogTown_Tileset
-	.4byte PacifidlogTown_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
 Route101_MapBorder:: @ 8292D8C
 	.incbin "data/maps/Route101/border.bin"
@@ -228,13 +244,14 @@ Route101_MapBorder:: @ 8292D8C
 Route101_MapBlockdata:: @ 8292D94
 	.incbin "data/maps/Route101/map.bin"
 
+	.align 2
 Route101_MapAttributes:: @ 82930B4
 	.4byte 0x14
 	.4byte 0x14
 	.4byte Route101_MapBorder
 	.4byte Route101_MapBlockdata
-	.4byte Route101_Tileset
-	.4byte Route101_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
 
 Route102_MapBorder:: @ 82930CC
 	.incbin "data/maps/Route102/border.bin"
@@ -242,13 +259,14 @@ Route102_MapBorder:: @ 82930CC
 Route102_MapBlockdata:: @ 82930D4
 	.incbin "data/maps/Route102/map.bin"
 
+	.align 2
 Route102_MapAttributes:: @ 82938A4
 	.4byte 0x32
 	.4byte 0x14
 	.4byte Route102_MapBorder
 	.4byte Route102_MapBlockdata
-	.4byte Route102_Tileset
-	.4byte Route102_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
 
 Route103_MapBorder:: @ 82938BC
 	.incbin "data/maps/Route103/border.bin"
@@ -256,13 +274,14 @@ Route103_MapBorder:: @ 82938BC
 Route103_MapBlockdata:: @ 82938C4
 	.incbin "data/maps/Route103/map.bin"
 
+	.align 2
 Route103_MapAttributes:: @ 8294544
 	.4byte 0x50
 	.4byte 0x14
 	.4byte Route103_MapBorder
 	.4byte Route103_MapBlockdata
-	.4byte Route103_Tileset
-	.4byte Route103_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
 
 Route104_MapBorder:: @ 829455C
 	.incbin "data/maps/Route104/border.bin"
@@ -270,13 +289,14 @@ Route104_MapBorder:: @ 829455C
 Route104_MapBlockdata:: @ 8294564
 	.incbin "data/maps/Route104/map.bin"
 
+	.align 2
 Route104_MapAttributes:: @ 8295E64
 	.4byte 0x28
 	.4byte 0x50
 	.4byte Route104_MapBorder
 	.4byte Route104_MapBlockdata
-	.4byte Route104_Tileset
-	.4byte Route104_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
 
 Route105_MapBorder:: @ 8295E7C
 	.incbin "data/maps/Route105/border.bin"
@@ -284,13 +304,14 @@ Route105_MapBorder:: @ 8295E7C
 Route105_MapBlockdata:: @ 8295E84
 	.incbin "data/maps/Route105/map.bin"
 
+	.align 2
 Route105_MapAttributes:: @ 8297784
 	.4byte 0x28
 	.4byte 0x50
 	.4byte Route105_MapBorder
 	.4byte Route105_MapBlockdata
-	.4byte Route105_Tileset
-	.4byte Route105_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
 
 Route106_MapBorder:: @ 829779C
 	.incbin "data/maps/Route106/border.bin"
@@ -298,13 +319,14 @@ Route106_MapBorder:: @ 829779C
 Route106_MapBlockdata:: @ 82977A4
 	.incbin "data/maps/Route106/map.bin"
 
+	.align 2
 Route106_MapAttributes:: @ 8298424
 	.4byte 0x50
 	.4byte 0x14
 	.4byte Route106_MapBorder
 	.4byte Route106_MapBlockdata
-	.4byte Route106_Tileset
-	.4byte Route106_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
 
 Route107_MapBorder:: @ 829843C
 	.incbin "data/maps/Route107/border.bin"
@@ -312,13 +334,14 @@ Route107_MapBorder:: @ 829843C
 Route107_MapBlockdata:: @ 8298444
 	.incbin "data/maps/Route107/map.bin"
 
+	.align 2
 Route107_MapAttributes:: @ 8298DA4
 	.4byte 0x3c
 	.4byte 0x14
 	.4byte Route107_MapBorder
 	.4byte Route107_MapBlockdata
-	.4byte Route107_Tileset
-	.4byte Route107_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
 
 Route108_MapBorder:: @ 8298DBC
 	.incbin "data/maps/Route108/border.bin"
@@ -326,13 +349,14 @@ Route108_MapBorder:: @ 8298DBC
 Route108_MapBlockdata:: @ 8298DC4
 	.incbin "data/maps/Route108/map.bin"
 
+	.align 2
 Route108_MapAttributes:: @ 8299724
 	.4byte 0x3c
 	.4byte 0x14
 	.4byte Route108_MapBorder
 	.4byte Route108_MapBlockdata
-	.4byte Route108_Tileset
-	.4byte Route108_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Slateport
 
 Route109_MapBorder:: @ 829973C
 	.incbin "data/maps/Route109/border.bin"
@@ -340,13 +364,14 @@ Route109_MapBorder:: @ 829973C
 Route109_MapBlockdata:: @ 8299744
 	.incbin "data/maps/Route109/map.bin"
 
+	.align 2
 Route109_MapAttributes:: @ 829AA04
 	.4byte 0x28
 	.4byte 0x3c
 	.4byte Route109_MapBorder
 	.4byte Route109_MapBlockdata
-	.4byte Route109_Tileset
-	.4byte Route109_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Slateport
 
 Route110_MapBorder:: @ 829AA1C
 	.incbin "data/maps/Route110/border.bin"
@@ -354,13 +379,14 @@ Route110_MapBorder:: @ 829AA1C
 Route110_MapBlockdata:: @ 829AA24
 	.incbin "data/maps/Route110/map.bin"
 
+	.align 2
 Route110_MapAttributes:: @ 829C964
 	.4byte 0x28
 	.4byte 0x64
 	.4byte Route110_MapBorder
 	.4byte Route110_MapBlockdata
-	.4byte Route110_Tileset
-	.4byte Route110_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
 
 Route111_MapBorder:: @ 829C97C
 	.incbin "data/maps/Route111/border.bin"
@@ -368,13 +394,14 @@ Route111_MapBorder:: @ 829C97C
 Route111_MapBlockdata:: @ 829C984
 	.incbin "data/maps/Route111/map.bin"
 
+	.align 2
 Route111_MapAttributes:: @ 829F544
 	.4byte 0x28
 	.4byte 0x8c
 	.4byte Route111_MapBorder
 	.4byte Route111_MapBlockdata
-	.4byte Route111_Tileset
-	.4byte Route111_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
 
 Route112_MapBorder:: @ 829F55C
 	.incbin "data/maps/Route112/border.bin"
@@ -382,13 +409,14 @@ Route112_MapBorder:: @ 829F55C
 Route112_MapBlockdata:: @ 829F564
 	.incbin "data/maps/Route112/map.bin"
 
+	.align 2
 Route112_MapAttributes:: @ 82A0824
 	.4byte 0x28
 	.4byte 0x3c
 	.4byte Route112_MapBorder
 	.4byte Route112_MapBlockdata
-	.4byte Route112_Tileset
-	.4byte Route112_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
 
 Route113_MapBorder:: @ 82A083C
 	.incbin "data/maps/Route113/border.bin"
@@ -396,13 +424,14 @@ Route113_MapBorder:: @ 82A083C
 Route113_MapBlockdata:: @ 82A0844
 	.incbin "data/maps/Route113/map.bin"
 
+	.align 2
 Route113_MapAttributes:: @ 82A17E4
 	.4byte 0x64
 	.4byte 0x14
 	.4byte Route113_MapBorder
 	.4byte Route113_MapBlockdata
-	.4byte Route113_Tileset
-	.4byte Route113_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
 
 Route114_MapBorder:: @ 82A17FC
 	.incbin "data/maps/Route114/border.bin"
@@ -410,13 +439,14 @@ Route114_MapBorder:: @ 82A17FC
 Route114_MapBlockdata:: @ 82A1804
 	.incbin "data/maps/Route114/map.bin"
 
+	.align 2
 Route114_MapAttributes:: @ 82A3104
 	.4byte 0x28
 	.4byte 0x50
 	.4byte Route114_MapBorder
 	.4byte Route114_MapBlockdata
-	.4byte Route114_Tileset
-	.4byte Route114_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
 
 Route115_MapBorder:: @ 82A311C
 	.incbin "data/maps/Route115/border.bin"
@@ -424,13 +454,14 @@ Route115_MapBorder:: @ 82A311C
 Route115_MapBlockdata:: @ 82A3124
 	.incbin "data/maps/Route115/map.bin"
 
+	.align 2
 Route115_MapAttributes:: @ 82A4A24
 	.4byte 0x28
 	.4byte 0x50
 	.4byte Route115_MapBorder
 	.4byte Route115_MapBlockdata
-	.4byte Route115_Tileset
-	.4byte Route115_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
 
 Route116_MapBorder:: @ 82A4A3C
 	.incbin "data/maps/Route116/border.bin"
@@ -438,13 +469,14 @@ Route116_MapBorder:: @ 82A4A3C
 Route116_MapBlockdata:: @ 82A4A44
 	.incbin "data/maps/Route116/map.bin"
 
+	.align 2
 Route116_MapAttributes:: @ 82A59E4
 	.4byte 0x64
 	.4byte 0x14
 	.4byte Route116_MapBorder
 	.4byte Route116_MapBlockdata
-	.4byte Route116_Tileset
-	.4byte Route116_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
 
 Route117_MapBorder:: @ 82A59FC
 	.incbin "data/maps/Route117/border.bin"
@@ -452,13 +484,14 @@ Route117_MapBorder:: @ 82A59FC
 Route117_MapBlockdata:: @ 82A5A04
 	.incbin "data/maps/Route117/map.bin"
 
+	.align 2
 Route117_MapAttributes:: @ 82A6364
 	.4byte 0x3c
 	.4byte 0x14
 	.4byte Route117_MapBorder
 	.4byte Route117_MapBlockdata
-	.4byte Route117_Tileset
-	.4byte Route117_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
 
 Route118_MapBorder:: @ 82A637C
 	.incbin "data/maps/Route118/border.bin"
@@ -466,13 +499,14 @@ Route118_MapBorder:: @ 82A637C
 Route118_MapBlockdata:: @ 82A6384
 	.incbin "data/maps/Route118/map.bin"
 
+	.align 2
 Route118_MapAttributes:: @ 82A7004
 	.4byte 0x50
 	.4byte 0x14
 	.4byte Route118_MapBorder
 	.4byte Route118_MapBlockdata
-	.4byte Route118_Tileset
-	.4byte Route118_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
 
 Route119_MapBorder:: @ 82A701C
 	.incbin "data/maps/Route119/border.bin"
@@ -480,13 +514,14 @@ Route119_MapBorder:: @ 82A701C
 Route119_MapBlockdata:: @ 82A7024
 	.incbin "data/maps/Route119/map.bin"
 
+	.align 2
 Route119_MapAttributes:: @ 82A9BE4
 	.4byte 0x28
 	.4byte 0x8c
 	.4byte Route119_MapBorder
 	.4byte Route119_MapBlockdata
-	.4byte Route119_Tileset
-	.4byte Route119_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Fortree
 
 Route120_MapBorder:: @ 82A9BFC
 	.incbin "data/maps/Route120/border.bin"
@@ -494,13 +529,14 @@ Route120_MapBorder:: @ 82A9BFC
 Route120_MapBlockdata:: @ 82A9C04
 	.incbin "data/maps/Route120/map.bin"
 
+	.align 2
 Route120_MapAttributes:: @ 82ABB44
 	.4byte 0x28
 	.4byte 0x64
 	.4byte Route120_MapBorder
 	.4byte Route120_MapBlockdata
-	.4byte Route120_Tileset
-	.4byte Route120_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Fortree
 
 Route121_MapBorder:: @ 82ABB5C
 	.incbin "data/maps/Route121/border.bin"
@@ -508,13 +544,14 @@ Route121_MapBorder:: @ 82ABB5C
 Route121_MapBlockdata:: @ 82ABB64
 	.incbin "data/maps/Route121/map.bin"
 
+	.align 2
 Route121_MapAttributes:: @ 82AC7E4
 	.4byte 0x50
 	.4byte 0x14
 	.4byte Route121_MapBorder
 	.4byte Route121_MapBlockdata
-	.4byte Route121_Tileset
-	.4byte Route121_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
 
 Route122_MapBorder:: @ 82AC7FC
 	.incbin "data/maps/Route122/border.bin"
@@ -522,13 +559,14 @@ Route122_MapBorder:: @ 82AC7FC
 Route122_MapBlockdata:: @ 82AC804
 	.incbin "data/maps/Route122/map.bin"
 
+	.align 2
 Route122_MapAttributes:: @ 82AD484
 	.4byte 0x28
 	.4byte 0x28
 	.4byte Route122_MapBorder
 	.4byte Route122_MapBlockdata
-	.4byte Route122_Tileset
-	.4byte Route122_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
 
 Route123_MapBorder:: @ 82AD49C
 	.incbin "data/maps/Route123/border.bin"
@@ -536,13 +574,14 @@ Route123_MapBorder:: @ 82AD49C
 Route123_MapBlockdata:: @ 82AD4A4
 	.incbin "data/maps/Route123/map.bin"
 
+	.align 2
 Route123_MapAttributes:: @ 82AEA84
 	.4byte 0x8c
 	.4byte 0x14
 	.4byte Route123_MapBorder
 	.4byte Route123_MapBlockdata
-	.4byte Route123_Tileset
-	.4byte Route123_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
 
 Route124_MapBorder:: @ 82AEA9C
 	.incbin "data/maps/Route124/border.bin"
@@ -550,13 +589,14 @@ Route124_MapBorder:: @ 82AEA9C
 Route124_MapBlockdata:: @ 82AEAA4
 	.incbin "data/maps/Route124/map.bin"
 
+	.align 2
 Route124_MapAttributes:: @ 82B1CA4
 	.4byte 0x50
 	.4byte 0x50
 	.4byte Route124_MapBorder
 	.4byte Route124_MapBlockdata
-	.4byte Route124_Tileset
-	.4byte Route124_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
 
 Route125_MapBorder:: @ 82B1CBC
 	.incbin "data/maps/Route125/border.bin"
@@ -564,13 +604,14 @@ Route125_MapBorder:: @ 82B1CBC
 Route125_MapBlockdata:: @ 82B1CC4
 	.incbin "data/maps/Route125/map.bin"
 
+	.align 2
 Route125_MapAttributes:: @ 82B35C4
 	.4byte 0x50
 	.4byte 0x28
 	.4byte Route125_MapBorder
 	.4byte Route125_MapBlockdata
-	.4byte Route125_Tileset
-	.4byte Route125_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
 
 Route126_MapBorder:: @ 82B35DC
 	.incbin "data/maps/Route126/border.bin"
@@ -578,13 +619,14 @@ Route126_MapBorder:: @ 82B35DC
 Route126_MapBlockdata:: @ 82B35E4
 	.incbin "data/maps/Route126/map.bin"
 
+	.align 2
 Route126_MapAttributes:: @ 82B67E4
 	.4byte 0x50
 	.4byte 0x50
 	.4byte Route126_MapBorder
 	.4byte Route126_MapBlockdata
-	.4byte Route126_Tileset
-	.4byte Route126_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
 
 Route127_MapBorder:: @ 82B67FC
 	.incbin "data/maps/Route127/border.bin"
@@ -592,13 +634,14 @@ Route127_MapBorder:: @ 82B67FC
 Route127_MapBlockdata:: @ 82B6804
 	.incbin "data/maps/Route127/map.bin"
 
+	.align 2
 Route127_MapAttributes:: @ 82B9A04
 	.4byte 0x50
 	.4byte 0x50
 	.4byte Route127_MapBorder
 	.4byte Route127_MapBlockdata
-	.4byte Route127_Tileset
-	.4byte Route127_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
 
 Route128_MapBorder:: @ 82B9A1C
 	.incbin "data/maps/Route128/border.bin"
@@ -606,13 +649,14 @@ Route128_MapBorder:: @ 82B9A1C
 Route128_MapBlockdata:: @ 82B9A24
 	.incbin "data/maps/Route128/map.bin"
 
+	.align 2
 Route128_MapAttributes:: @ 82BBFA4
 	.4byte 0x78
 	.4byte 0x28
 	.4byte Route128_MapBorder
 	.4byte Route128_MapBlockdata
-	.4byte Route128_Tileset
-	.4byte Route128_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
 
 Route129_MapBorder:: @ 82BBFBC
 	.incbin "data/maps/Route129/border.bin"
@@ -620,15 +664,29 @@ Route129_MapBorder:: @ 82BBFBC
 Route129_MapBlockdata:: @ 82BBFC4
 	.incbin "data/maps/Route129/map.bin"
 
+	.align 2
 Route129_MapAttributes:: @ 82BD8C4
 	.4byte 0x50
 	.4byte 0x28
 	.4byte Route129_MapBorder
 	.4byte Route129_MapBlockdata
-	.4byte Route129_Tileset
-	.4byte Route129_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
 
-	.incbin "baserom.gba", 0x2bd8dc, 0x1920
+UnreferencedMap_MapBorder: @ 82BD8DC
+	.incbin "baserom.gba", 0x2bd8dc, 8
+
+UnreferencedMap_MapBlockdata: @ 82BD8E4
+	.incbin "baserom.gba", 0x2bd8e4, 0x1900
+
+	.align 2
+UnreferencedMap_MapAttributes:: @ 82BF1E4
+	.4byte 0x50
+	.4byte 0x28
+	.4byte UnreferencedMap_MapBorder
+	.4byte UnreferencedMap_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 Route131_MapBorder:: @ 82BF1FC
 	.incbin "data/maps/Route131/border.bin"
@@ -636,13 +694,14 @@ Route131_MapBorder:: @ 82BF1FC
 Route131_MapBlockdata:: @ 82BF204
 	.incbin "data/maps/Route131/map.bin"
 
+	.align 2
 Route131_MapAttributes:: @ 82C04C4
 	.4byte 0x3c
 	.4byte 0x28
 	.4byte Route131_MapBorder
 	.4byte Route131_MapBlockdata
-	.4byte Route131_Tileset
-	.4byte Route131_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
 Route132_MapBorder:: @ 82C04DC
 	.incbin "data/maps/Route132/border.bin"
@@ -650,13 +709,14 @@ Route132_MapBorder:: @ 82C04DC
 Route132_MapBlockdata:: @ 82C04E4
 	.incbin "data/maps/Route132/map.bin"
 
+	.align 2
 Route132_MapAttributes:: @ 82C1DE4
 	.4byte 0x50
 	.4byte 0x28
 	.4byte Route132_MapBorder
 	.4byte Route132_MapBlockdata
-	.4byte Route132_Tileset
-	.4byte Route132_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
 Route133_MapBorder:: @ 82C1DFC
 	.incbin "data/maps/Route133/border.bin"
@@ -664,13 +724,14 @@ Route133_MapBorder:: @ 82C1DFC
 Route133_MapBlockdata:: @ 82C1E04
 	.incbin "data/maps/Route133/map.bin"
 
+	.align 2
 Route133_MapAttributes:: @ 82C3704
 	.4byte 0x50
 	.4byte 0x28
 	.4byte Route133_MapBorder
 	.4byte Route133_MapBlockdata
-	.4byte Route133_Tileset
-	.4byte Route133_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
 Route134_MapBorder:: @ 82C371C
 	.incbin "data/maps/Route134/border.bin"
@@ -678,13 +739,14 @@ Route134_MapBorder:: @ 82C371C
 Route134_MapBlockdata:: @ 82C3724
 	.incbin "data/maps/Route134/map.bin"
 
+	.align 2
 Route134_MapAttributes:: @ 82C5024
 	.4byte 0x50
 	.4byte 0x28
 	.4byte Route134_MapBorder
 	.4byte Route134_MapBlockdata
-	.4byte Route134_Tileset
-	.4byte Route134_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
 Underwater2_MapBorder:: @ 82C503C
 	.incbin "data/maps/Underwater2/border.bin"
@@ -692,13 +754,14 @@ Underwater2_MapBorder:: @ 82C503C
 Underwater2_MapBlockdata:: @ 82C5044
 	.incbin "data/maps/Underwater2/map.bin"
 
+	.align 2
 Underwater2_MapAttributes:: @ 82C8244
 	.4byte 0x50
 	.4byte 0x50
 	.4byte Underwater2_MapBorder
 	.4byte Underwater2_MapBlockdata
-	.4byte Underwater2_Tileset
-	.4byte Underwater2_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
 
 Underwater3_MapBorder:: @ 82C825C
 	.incbin "data/maps/Underwater3/border.bin"
@@ -706,13 +769,14 @@ Underwater3_MapBorder:: @ 82C825C
 Underwater3_MapBlockdata:: @ 82C8264
 	.incbin "data/maps/Underwater3/map.bin"
 
+	.align 2
 Underwater3_MapAttributes:: @ 82CB464
 	.4byte 0x50
 	.4byte 0x50
 	.4byte Underwater3_MapBorder
 	.4byte Underwater3_MapBlockdata
-	.4byte Underwater3_Tileset
-	.4byte Underwater3_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
 
 Underwater4_MapBorder:: @ 82CB47C
 	.incbin "data/maps/Underwater4/border.bin"
@@ -720,13 +784,14 @@ Underwater4_MapBorder:: @ 82CB47C
 Underwater4_MapBlockdata:: @ 82CB484
 	.incbin "data/maps/Underwater4/map.bin"
 
+	.align 2
 Underwater4_MapAttributes:: @ 82CDA04
 	.4byte 0x78
 	.4byte 0x28
 	.4byte Underwater4_MapBorder
 	.4byte Underwater4_MapBlockdata
-	.4byte Underwater4_Tileset
-	.4byte Underwater4_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
 
 LittlerootTown_BrendansHouse_1F_MapBorder:: @ 82CDA1C
 	.incbin "data/maps/LittlerootTown_BrendansHouse_1F/border.bin"
@@ -734,15 +799,14 @@ LittlerootTown_BrendansHouse_1F_MapBorder:: @ 82CDA1C
 LittlerootTown_BrendansHouse_1F_MapBlockdata:: @ 82CDA24
 	.incbin "data/maps/LittlerootTown_BrendansHouse_1F/map.bin"
 
-	.incbin "baserom.gba", 0x2cdaea, 0x2
-
+	.align 2
 LittlerootTown_BrendansHouse_1F_MapAttributes:: @ 82CDAEC
 	.4byte 0xb
 	.4byte 0x9
 	.4byte LittlerootTown_BrendansHouse_1F_MapBorder
 	.4byte LittlerootTown_BrendansHouse_1F_MapBlockdata
-	.4byte LittlerootTown_BrendansHouse_1F_Tileset
-	.4byte LittlerootTown_BrendansHouse_1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
 
 LittlerootTown_BrendansHouse_2F_MapBorder:: @ 82CDB04
 	.incbin "data/maps/LittlerootTown_BrendansHouse_2F/border.bin"
@@ -750,13 +814,14 @@ LittlerootTown_BrendansHouse_2F_MapBorder:: @ 82CDB04
 LittlerootTown_BrendansHouse_2F_MapBlockdata:: @ 82CDB0C
 	.incbin "data/maps/LittlerootTown_BrendansHouse_2F/map.bin"
 
+	.align 2
 LittlerootTown_BrendansHouse_2F_MapAttributes:: @ 82CDB9C
 	.4byte 0x9
 	.4byte 0x8
 	.4byte LittlerootTown_BrendansHouse_2F_MapBorder
 	.4byte LittlerootTown_BrendansHouse_2F_MapBlockdata
-	.4byte LittlerootTown_BrendansHouse_2F_Tileset
-	.4byte LittlerootTown_BrendansHouse_2F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
 
 LittlerootTown_MaysHouse_1F_MapBorder:: @ 82CDBB4
 	.incbin "data/maps/LittlerootTown_MaysHouse_1F/border.bin"
@@ -764,15 +829,14 @@ LittlerootTown_MaysHouse_1F_MapBorder:: @ 82CDBB4
 LittlerootTown_MaysHouse_1F_MapBlockdata:: @ 82CDBBC
 	.incbin "data/maps/LittlerootTown_MaysHouse_1F/map.bin"
 
-	.incbin "baserom.gba", 0x2cdc82, 0x2
-
+	.align 2
 LittlerootTown_MaysHouse_1F_MapAttributes:: @ 82CDC84
 	.4byte 0xb
 	.4byte 0x9
 	.4byte LittlerootTown_MaysHouse_1F_MapBorder
 	.4byte LittlerootTown_MaysHouse_1F_MapBlockdata
-	.4byte LittlerootTown_MaysHouse_1F_Tileset
-	.4byte LittlerootTown_MaysHouse_1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
 
 LittlerootTown_MaysHouse_2F_MapBorder:: @ 82CDC9C
 	.incbin "data/maps/LittlerootTown_MaysHouse_2F/border.bin"
@@ -780,13 +844,14 @@ LittlerootTown_MaysHouse_2F_MapBorder:: @ 82CDC9C
 LittlerootTown_MaysHouse_2F_MapBlockdata:: @ 82CDCA4
 	.incbin "data/maps/LittlerootTown_MaysHouse_2F/map.bin"
 
+	.align 2
 LittlerootTown_MaysHouse_2F_MapAttributes:: @ 82CDD34
 	.4byte 0x9
 	.4byte 0x8
 	.4byte LittlerootTown_MaysHouse_2F_MapBorder
 	.4byte LittlerootTown_MaysHouse_2F_MapBlockdata
-	.4byte LittlerootTown_MaysHouse_2F_Tileset
-	.4byte LittlerootTown_MaysHouse_2F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
 
 LittlerootTown_ProfessorBirchsLab_MapBorder:: @ 82CDD4C
 	.incbin "data/maps/LittlerootTown_ProfessorBirchsLab/border.bin"
@@ -794,142 +859,89 @@ LittlerootTown_ProfessorBirchsLab_MapBorder:: @ 82CDD4C
 LittlerootTown_ProfessorBirchsLab_MapBlockdata:: @ 82CDD54
 	.incbin "data/maps/LittlerootTown_ProfessorBirchsLab/map.bin"
 
-	.incbin "baserom.gba", 0x2cdea6, 0x2
-
+	.align 2
 LittlerootTown_ProfessorBirchsLab_MapAttributes:: @ 82CDEA8
 	.4byte 0xd
 	.4byte 0xd
 	.4byte LittlerootTown_ProfessorBirchsLab_MapBorder
 	.4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata
-	.4byte LittlerootTown_ProfessorBirchsLab_Tileset
-	.4byte LittlerootTown_ProfessorBirchsLab_Tileset2
-
-OldaleTown_House1_MapBorder:: @ 82CDEC0
-	.incbin "data/maps/OldaleTown_House1/border.bin"
-
-OldaleTown_House1_MapBlockdata:: @ 82CDEC8
-	.incbin "data/maps/OldaleTown_House1/map.bin"
-
-FallarborTown_House1_MapAttributes:: @ 82CDF7C
-LilycoveCity_House1_MapAttributes:: @ 82CDF7C
-LilycoveCity_House4_MapAttributes:: @ 82CDF7C
-MauvilleCity_House2_MapAttributes:: @ 82CDF7C
-MossdeepCity_House2_MapAttributes:: @ 82CDF7C
-OldaleTown_House1_MapAttributes:: @ 82CDF7C
-PetalburgCity_House1_MapAttributes:: @ 82CDF7C
-Route119_House_MapAttributes:: @ 82CDF7C
-VerdanturfTown_House_MapAttributes:: @ 82CDF7C
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
+
+House1_MapBorder:: @ 82CDEC0
+	.incbin "data/maps/House1/border.bin"
+
+House1_MapBlockdata:: @ 82CDEC8
+	.incbin "data/maps/House1/map.bin"
+
+	.align 2
+House1_MapAttributes:: @ 82CDF7C
 	.4byte 0xa
 	.4byte 0x9
-	.4byte OldaleTown_House1_MapBorder
-	.4byte OldaleTown_House1_MapBlockdata
-	.4byte OldaleTown_House1_Tileset
-	.4byte OldaleTown_House1_Tileset2
-
-OldaleTown_House2_MapBorder:: @ 82CDF94
-	.incbin "data/maps/OldaleTown_House2/border.bin"
-
-OldaleTown_House2_MapBlockdata:: @ 82CDF9C
-	.incbin "data/maps/OldaleTown_House2/map.bin"
-
-FallarborTown_House2_MapAttributes:: @ 82CE04C
-LilycoveCity_House3_MapAttributes:: @ 82CE04C
-LilycoveCity_MoveDeletersHouse_MapAttributes:: @ 82CE04C
-MauvilleCity_House1_MapAttributes:: @ 82CE04C
-MossdeepCity_House1_MapAttributes:: @ 82CE04C
-MossdeepCity_House3_MapAttributes:: @ 82CE04C
-OldaleTown_House2_MapAttributes:: @ 82CE04C
-PetalburgCity_WallysHouse_MapAttributes:: @ 82CE04C
-Route111_WinstrateFamilysHouse_MapAttributes:: @ 82CE04C
-Route123_BerryMastersHouse_MapAttributes:: @ 82CE04C
-SlateportCity_House2_MapAttributes:: @ 82CE04C
-VerdanturfTown_FriendshipRatersHouse_MapAttributes:: @ 82CE04C
+	.4byte House1_MapBorder
+	.4byte House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
+
+House2_MapBorder:: @ 82CDF94
+	.incbin "data/maps/House2/border.bin"
+
+House2_MapBlockdata:: @ 82CDF9C
+	.incbin "data/maps/House2/map.bin"
+
+	.align 2
+House2_MapAttributes:: @ 82CE04C
 	.4byte 0xb
 	.4byte 0x8
-	.4byte OldaleTown_House2_MapBorder
-	.4byte OldaleTown_House2_MapBlockdata
-	.4byte OldaleTown_House2_Tileset
-	.4byte OldaleTown_House2_Tileset2
+	.4byte House2_MapBorder
+	.4byte House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
-OldaleTown_PokemonCenter_1F_MapBorder:: @ 82CE064
+PokemonCenter_1F_MapBorder:: @ 82CE064
 	.incbin "data/maps/OldaleTown_PokemonCenter_1F/border.bin"
 
-OldaleTown_PokemonCenter_1F_MapBlockdata:: @ 82CE06C
+PokemonCenter_1F_MapBlockdata:: @ 82CE06C
 	.incbin "data/maps/OldaleTown_PokemonCenter_1F/map.bin"
 
-DewfordTown_PokemonCenter_1F_MapAttributes:: @ 82CE168
-EverGrandeCity_PokemonCenter_1F_MapAttributes:: @ 82CE168
-FallarborTown_PokemonCenter_1F_MapAttributes:: @ 82CE168
-FortreeCity_PokemonCenter_1F_MapAttributes:: @ 82CE168
-LilycoveCity_PokemonCenter_1F_MapAttributes:: @ 82CE168
-MauvilleCity_PokemonCenter_1F_MapAttributes:: @ 82CE168
-MossdeepCity_PokemonCenter_1F_MapAttributes:: @ 82CE168
-OldaleTown_PokemonCenter_1F_MapAttributes:: @ 82CE168
-PacifidlogTown_PokemonCenter_1F_MapAttributes:: @ 82CE168
-PetalburgCity_PokemonCenter_1F_MapAttributes:: @ 82CE168
-RustboroCity_PokemonCenter_1F_MapAttributes:: @ 82CE168
-SlateportCity_PokemonCenter_1F_MapAttributes:: @ 82CE168
-SootopolisCity_PokemonCenter_1F_MapAttributes:: @ 82CE168
-VerdanturfTown_PokemonCenter_1F_MapAttributes:: @ 82CE168
+	.align 2
+PokemonCenter_1F_MapAttributes:: @ 82CE168
 	.4byte 0xe
 	.4byte 0x9
-	.4byte OldaleTown_PokemonCenter_1F_MapBorder
-	.4byte OldaleTown_PokemonCenter_1F_MapBlockdata
-	.4byte OldaleTown_PokemonCenter_1F_Tileset
-	.4byte OldaleTown_PokemonCenter_1F_Tileset2
+	.4byte PokemonCenter_1F_MapBorder
+	.4byte PokemonCenter_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
 
-OldaleTown_PokemonCenter_2F_MapBorder:: @ 82CE180
+PokemonCenter_2F_MapBorder:: @ 82CE180
 	.incbin "data/maps/OldaleTown_PokemonCenter_2F/border.bin"
 
-OldaleTown_PokemonCenter_2F_MapBlockdata:: @ 82CE188
+PokemonCenter_2F_MapBlockdata:: @ 82CE188
 	.incbin "data/maps/OldaleTown_PokemonCenter_2F/map.bin"
 
-DewfordTown_PokemonCenter_2F_MapAttributes:: @ 82CE284
-EverGrandeCity_PokemonCenter_2F_MapAttributes:: @ 82CE284
-FallarborTown_PokemonCenter_2F_MapAttributes:: @ 82CE284
-FortreeCity_PokemonCenter_2F_MapAttributes:: @ 82CE284
-LavaridgeTown_PokemonCenter_2F_MapAttributes:: @ 82CE284
-LilycoveCity_PokemonCenter_2F_MapAttributes:: @ 82CE284
-MauvilleCity_PokemonCenter_2F_MapAttributes:: @ 82CE284
-MossdeepCity_PokemonCenter_2F_MapAttributes:: @ 82CE284
-OldaleTown_PokemonCenter_2F_MapAttributes:: @ 82CE284
-PacifidlogTown_PokemonCenter_2F_MapAttributes:: @ 82CE284
-PetalburgCity_PokemonCenter_2F_MapAttributes:: @ 82CE284
-RustboroCity_PokemonCenter_2F_MapAttributes:: @ 82CE284
-SlateportCity_PokemonCenter_2F_MapAttributes:: @ 82CE284
-SootopolisCity_PokemonCenter_2F_MapAttributes:: @ 82CE284
-VerdanturfTown_PokemonCenter_2F_MapAttributes:: @ 82CE284
+	.align 2
+PokemonCenter_2F_MapAttributes:: @ 82CE284
 	.4byte 0xe
 	.4byte 0x9
-	.4byte OldaleTown_PokemonCenter_2F_MapBorder
-	.4byte OldaleTown_PokemonCenter_2F_MapBlockdata
-	.4byte OldaleTown_PokemonCenter_2F_Tileset
-	.4byte OldaleTown_PokemonCenter_2F_Tileset2
+	.4byte PokemonCenter_2F_MapBorder
+	.4byte PokemonCenter_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
 
-OldaleTown_Mart_MapBorder:: @ 82CE29C
+PokeMart_MapBorder:: @ 82CE29C
 	.incbin "data/maps/OldaleTown_Mart/border.bin"
 
-OldaleTown_Mart_MapBlockdata:: @ 82CE2A4
+PokeMart_MapBlockdata:: @ 82CE2A4
 	.incbin "data/maps/OldaleTown_Mart/map.bin"
 
-FallarborTown_Mart_MapAttributes:: @ 82CE354
-FortreeCity_Mart_MapAttributes:: @ 82CE354
-LavaridgeTown_Mart_MapAttributes:: @ 82CE354
-LilycoveCity_UnusedMart_MapAttributes:: @ 82CE354
-MauvilleCity_Mart_MapAttributes:: @ 82CE354
-MossdeepCity_Mart_MapAttributes:: @ 82CE354
-OldaleTown_Mart_MapAttributes:: @ 82CE354
-PetalburgCity_Mart_MapAttributes:: @ 82CE354
-RustboroCity_Mart_MapAttributes:: @ 82CE354
-SlateportCity_Mart_MapAttributes:: @ 82CE354
-SootopolisCity_Mart_MapAttributes:: @ 82CE354
-VerdanturfTown_Mart_MapAttributes:: @ 82CE354
+	.align 2
+PokeMart_MapAttributes:: @ 82CE354
 	.4byte 0xb
 	.4byte 0x8
-	.4byte OldaleTown_Mart_MapBorder
-	.4byte OldaleTown_Mart_MapBlockdata
-	.4byte OldaleTown_Mart_Tileset
-	.4byte OldaleTown_Mart_Tileset2
+	.4byte PokeMart_MapBorder
+	.4byte PokeMart_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
 
 DewfordTown_House1_MapBorder:: @ 82CE36C
 	.incbin "data/maps/DewfordTown_House1/border.bin"
@@ -937,6 +949,7 @@ DewfordTown_House1_MapBorder:: @ 82CE36C
 DewfordTown_House1_MapBlockdata:: @ 82CE374
 	.incbin "data/maps/DewfordTown_House1/map.bin"
 
+	.align 2
 DewfordTown_House1_MapAttributes:: @ 82CE414
 LavaridgeTown_House_MapAttributes:: @ 82CE414
 Route111_OldLadysRestStop_MapAttributes:: @ 82CE414
@@ -944,8 +957,8 @@ Route111_OldLadysRestStop_MapAttributes:: @ 82CE414
 	.4byte 0x8
 	.4byte DewfordTown_House1_MapBorder
 	.4byte DewfordTown_House1_MapBlockdata
-	.4byte DewfordTown_House1_Tileset
-	.4byte DewfordTown_House1_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 DewfordTown_Gym_MapBorder:: @ 82CE42C
 	.incbin "data/maps/DewfordTown_Gym/border.bin"
@@ -953,13 +966,14 @@ DewfordTown_Gym_MapBorder:: @ 82CE42C
 DewfordTown_Gym_MapBlockdata:: @ 82CE434
 	.incbin "data/maps/DewfordTown_Gym/map.bin"
 
+	.align 2
 DewfordTown_Gym_MapAttributes:: @ 82CE824
 	.4byte 0x12
 	.4byte 0x1c
 	.4byte DewfordTown_Gym_MapBorder
 	.4byte DewfordTown_Gym_MapBlockdata
-	.4byte DewfordTown_Gym_Tileset
-	.4byte DewfordTown_Gym_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_DewfordGym
 
 DewfordTown_Hall_MapBorder:: @ 82CE83C
 	.incbin "data/maps/DewfordTown_Hall/border.bin"
@@ -967,15 +981,14 @@ DewfordTown_Hall_MapBorder:: @ 82CE83C
 DewfordTown_Hall_MapBlockdata:: @ 82CE844
 	.incbin "data/maps/DewfordTown_Hall/map.bin"
 
-	.incbin "baserom.gba", 0x2ce976, 0x2
-
+	.align 2
 DewfordTown_Hall_MapAttributes:: @ 82CE978
 	.4byte 0x11
 	.4byte 0x9
 	.4byte DewfordTown_Hall_MapBorder
 	.4byte DewfordTown_Hall_MapBlockdata
-	.4byte DewfordTown_Hall_Tileset
-	.4byte DewfordTown_Hall_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 DewfordTown_House2_MapBorder:: @ 82CE990
 	.incbin "data/maps/DewfordTown_House2/border.bin"
@@ -983,14 +996,15 @@ DewfordTown_House2_MapBorder:: @ 82CE990
 DewfordTown_House2_MapBlockdata:: @ 82CE998
 	.incbin "data/maps/DewfordTown_House2/map.bin"
 
+	.align 2
 DewfordTown_House2_MapAttributes:: @ 82CEA4C
 Route113_GlassWorkshop_MapAttributes:: @ 82CEA4C
 	.4byte 0xa
 	.4byte 0x9
 	.4byte DewfordTown_House2_MapBorder
 	.4byte DewfordTown_House2_MapBlockdata
-	.4byte DewfordTown_House2_Tileset
-	.4byte DewfordTown_House2_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 LavaridgeTown_HerbShop_MapBorder:: @ 82CEA64
 	.incbin "data/maps/LavaridgeTown_HerbShop/border.bin"
@@ -998,13 +1012,14 @@ LavaridgeTown_HerbShop_MapBorder:: @ 82CEA64
 LavaridgeTown_HerbShop_MapBlockdata:: @ 82CEA6C
 	.incbin "data/maps/LavaridgeTown_HerbShop/map.bin"
 
+	.align 2
 LavaridgeTown_HerbShop_MapAttributes:: @ 82CEB1C
 	.4byte 0xb
 	.4byte 0x8
 	.4byte LavaridgeTown_HerbShop_MapBorder
 	.4byte LavaridgeTown_HerbShop_MapBlockdata
-	.4byte LavaridgeTown_HerbShop_Tileset
-	.4byte LavaridgeTown_HerbShop_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
 
 LavaridgeTown_Gym_1F_MapBorder:: @ 82CEB34
 	.incbin "data/maps/LavaridgeTown_Gym_1F/border.bin"
@@ -1012,13 +1027,14 @@ LavaridgeTown_Gym_1F_MapBorder:: @ 82CEB34
 LavaridgeTown_Gym_1F_MapBlockdata:: @ 82CEB3C
 	.incbin "data/maps/LavaridgeTown_Gym_1F/map.bin"
 
+	.align 2
 LavaridgeTown_Gym_1F_MapAttributes:: @ 82CED4C
 	.4byte 0xb
 	.4byte 0x18
 	.4byte LavaridgeTown_Gym_1F_MapBorder
 	.4byte LavaridgeTown_Gym_1F_MapBlockdata
-	.4byte LavaridgeTown_Gym_1F_Tileset
-	.4byte LavaridgeTown_Gym_1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_LavaridgeGym
 
 LavaridgeTown_Gym_B1F_MapBorder:: @ 82CED64
 	.incbin "data/maps/LavaridgeTown_Gym_B1F/border.bin"
@@ -1026,13 +1042,14 @@ LavaridgeTown_Gym_B1F_MapBorder:: @ 82CED64
 LavaridgeTown_Gym_B1F_MapBlockdata:: @ 82CED6C
 	.incbin "data/maps/LavaridgeTown_Gym_B1F/map.bin"
 
+	.align 2
 LavaridgeTown_Gym_B1F_MapAttributes:: @ 82CEF7C
 	.4byte 0xb
 	.4byte 0x18
 	.4byte LavaridgeTown_Gym_B1F_MapBorder
 	.4byte LavaridgeTown_Gym_B1F_MapBlockdata
-	.4byte LavaridgeTown_Gym_B1F_Tileset
-	.4byte LavaridgeTown_Gym_B1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_LavaridgeGym
 
 LavaridgeTown_PokemonCenter_1F_MapBorder:: @ 82CEF94
 	.incbin "data/maps/LavaridgeTown_PokemonCenter_1F/border.bin"
@@ -1040,13 +1057,14 @@ LavaridgeTown_PokemonCenter_1F_MapBorder:: @ 82CEF94
 LavaridgeTown_PokemonCenter_1F_MapBlockdata:: @ 82CEF9C
 	.incbin "data/maps/LavaridgeTown_PokemonCenter_1F/map.bin"
 
+	.align 2
 LavaridgeTown_PokemonCenter_1F_MapAttributes:: @ 82CF098
 	.4byte 0xe
 	.4byte 0x9
 	.4byte LavaridgeTown_PokemonCenter_1F_MapBorder
 	.4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata
-	.4byte LavaridgeTown_PokemonCenter_1F_Tileset
-	.4byte LavaridgeTown_PokemonCenter_1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
 
 FallarborTown_ContestLobby_MapBorder:: @ 82CF0B0
 	.incbin "data/maps/FallarborTown_ContestLobby/border.bin"
@@ -1054,8 +1072,7 @@ FallarborTown_ContestLobby_MapBorder:: @ 82CF0B0
 FallarborTown_ContestLobby_MapBlockdata:: @ 82CF0B8
 	.incbin "data/maps/FallarborTown_ContestLobby/map.bin"
 
-	.incbin "baserom.gba", 0x2cf18a, 0x2
-
+	.align 2
 FallarborTown_ContestLobby_MapAttributes:: @ 82CF18C
 SlateportCity_ContestLobby_MapAttributes:: @ 82CF18C
 VerdanturfTown_ContestLobby_MapAttributes:: @ 82CF18C
@@ -1063,8 +1080,8 @@ VerdanturfTown_ContestLobby_MapAttributes:: @ 82CF18C
 	.4byte 0x7
 	.4byte FallarborTown_ContestLobby_MapBorder
 	.4byte FallarborTown_ContestLobby_MapBlockdata
-	.4byte FallarborTown_ContestLobby_Tileset
-	.4byte FallarborTown_ContestLobby_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
 
 FallarborTown_ContestHall_MapBorder:: @ 82CF1A4
 	.incbin "data/maps/FallarborTown_ContestHall/border.bin"
@@ -1072,6 +1089,7 @@ FallarborTown_ContestHall_MapBorder:: @ 82CF1A4
 FallarborTown_ContestHall_MapBlockdata:: @ 82CF1AC
 	.incbin "data/maps/FallarborTown_ContestHall/map.bin"
 
+	.align 2
 FallarborTown_ContestHall_MapAttributes:: @ 82CF4A0
 SlateportCity_ContestHall_MapAttributes:: @ 82CF4A0
 VerdanturfTown_ContestHall_MapAttributes:: @ 82CF4A0
@@ -1079,8 +1097,8 @@ VerdanturfTown_ContestHall_MapAttributes:: @ 82CF4A0
 	.4byte 0x12
 	.4byte FallarborTown_ContestHall_MapBorder
 	.4byte FallarborTown_ContestHall_MapBlockdata
-	.4byte FallarborTown_ContestHall_Tileset
-	.4byte FallarborTown_ContestHall_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
 
 LilycoveCity_House2_MapBorder:: @ 82CF4B8
 	.incbin "data/maps/LilycoveCity_House2/border.bin"
@@ -1088,13 +1106,14 @@ LilycoveCity_House2_MapBorder:: @ 82CF4B8
 LilycoveCity_House2_MapBlockdata:: @ 82CF4C0
 	.incbin "data/maps/LilycoveCity_House2/map.bin"
 
+	.align 2
 LilycoveCity_House2_MapAttributes:: @ 82CF540
 	.4byte 0x8
 	.4byte 0x8
 	.4byte LilycoveCity_House2_MapBorder
 	.4byte LilycoveCity_House2_MapBlockdata
-	.4byte LilycoveCity_House2_Tileset
-	.4byte LilycoveCity_House2_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 	.incbin "baserom.gba", 0x2cf558, 0x24
 
@@ -1104,13 +1123,14 @@ VerdanturfTown_WandasHouse_MapBorder:: @ 82CF57C
 VerdanturfTown_WandasHouse_MapBlockdata:: @ 82CF584
 	.incbin "data/maps/VerdanturfTown_WandasHouse/map.bin"
 
+	.align 2
 VerdanturfTown_WandasHouse_MapAttributes:: @ 82CF694
 	.4byte 0x11
 	.4byte 0x8
 	.4byte VerdanturfTown_WandasHouse_MapBorder
 	.4byte VerdanturfTown_WandasHouse_MapBlockdata
-	.4byte VerdanturfTown_WandasHouse_Tileset
-	.4byte VerdanturfTown_WandasHouse_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 PacifidlogTown_House1_MapBorder:: @ 82CF6AC
 	.incbin "data/maps/PacifidlogTown_House1/border.bin"
@@ -1118,6 +1138,7 @@ PacifidlogTown_House1_MapBorder:: @ 82CF6AC
 PacifidlogTown_House1_MapBlockdata:: @ 82CF6B4
 	.incbin "data/maps/PacifidlogTown_House1/map.bin"
 
+	.align 2
 PacifidlogTown_House1_MapAttributes:: @ 82CF768
 PacifidlogTown_House3_MapAttributes:: @ 82CF768
 PacifidlogTown_House5_MapAttributes:: @ 82CF768
@@ -1125,8 +1146,8 @@ PacifidlogTown_House5_MapAttributes:: @ 82CF768
 	.4byte 0x9
 	.4byte PacifidlogTown_House1_MapBorder
 	.4byte PacifidlogTown_House1_MapBlockdata
-	.4byte PacifidlogTown_House1_Tileset
-	.4byte PacifidlogTown_House1_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 PacifidlogTown_House2_MapBorder:: @ 82CF780
 	.incbin "data/maps/PacifidlogTown_House2/border.bin"
@@ -1134,14 +1155,15 @@ PacifidlogTown_House2_MapBorder:: @ 82CF780
 PacifidlogTown_House2_MapBlockdata:: @ 82CF788
 	.incbin "data/maps/PacifidlogTown_House2/map.bin"
 
+	.align 2
 PacifidlogTown_House2_MapAttributes:: @ 82CF83C
 PacifidlogTown_House4_MapAttributes:: @ 82CF83C
 	.4byte 0xa
 	.4byte 0x9
 	.4byte PacifidlogTown_House2_MapBorder
 	.4byte PacifidlogTown_House2_MapBlockdata
-	.4byte PacifidlogTown_House2_Tileset
-	.4byte PacifidlogTown_House2_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 PetalburgCity_Gym_MapBorder:: @ 82CF854
 	.incbin "data/maps/PetalburgCity_Gym/border.bin"
@@ -1149,13 +1171,14 @@ PetalburgCity_Gym_MapBorder:: @ 82CF854
 PetalburgCity_Gym_MapBlockdata:: @ 82CF85C
 	.incbin "data/maps/PetalburgCity_Gym/map.bin"
 
+	.align 2
 PetalburgCity_Gym_MapAttributes:: @ 82D003C
 	.4byte 0x9
 	.4byte 0x70
 	.4byte PetalburgCity_Gym_MapBorder
 	.4byte PetalburgCity_Gym_MapBlockdata
-	.4byte PetalburgCity_Gym_Tileset
-	.4byte PetalburgCity_Gym_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_PetalburgGym
 
 PetalburgCity_House2_MapBorder:: @ 82D0054
 	.incbin "data/maps/PetalburgCity_House2/border.bin"
@@ -1163,6 +1186,7 @@ PetalburgCity_House2_MapBorder:: @ 82D0054
 PetalburgCity_House2_MapBlockdata:: @ 82D005C
 	.incbin "data/maps/PetalburgCity_House2/map.bin"
 
+	.align 2
 MossdeepCity_House4_MapAttributes:: @ 82D00FC
 PetalburgCity_House2_MapAttributes:: @ 82D00FC
 SlateportCity_House1_MapAttributes:: @ 82D00FC
@@ -1170,8 +1194,8 @@ SlateportCity_House1_MapAttributes:: @ 82D00FC
 	.4byte 0x8
 	.4byte PetalburgCity_House2_MapBorder
 	.4byte PetalburgCity_House2_MapBlockdata
-	.4byte PetalburgCity_House2_Tileset
-	.4byte PetalburgCity_House2_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 SlateportCity_SternsShipyard_1F_MapBorder:: @ 82D0114
 	.incbin "data/maps/SlateportCity_SternsShipyard_1F/border.bin"
@@ -1179,15 +1203,14 @@ SlateportCity_SternsShipyard_1F_MapBorder:: @ 82D0114
 SlateportCity_SternsShipyard_1F_MapBlockdata:: @ 82D011C
 	.incbin "data/maps/SlateportCity_SternsShipyard_1F/map.bin"
 
-	.incbin "baserom.gba", 0x2d0392, 0x2
-
+	.align 2
 SlateportCity_SternsShipyard_1F_MapAttributes:: @ 82D0394
 	.4byte 0x15
 	.4byte 0xf
 	.4byte SlateportCity_SternsShipyard_1F_MapBorder
 	.4byte SlateportCity_SternsShipyard_1F_MapBlockdata
-	.4byte SlateportCity_SternsShipyard_1F_Tileset
-	.4byte SlateportCity_SternsShipyard_1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 SlateportCity_SternsShipyard_2F_MapBorder:: @ 82D03AC
 	.incbin "data/maps/SlateportCity_SternsShipyard_2F/border.bin"
@@ -1195,15 +1218,14 @@ SlateportCity_SternsShipyard_2F_MapBorder:: @ 82D03AC
 SlateportCity_SternsShipyard_2F_MapBlockdata:: @ 82D03B4
 	.incbin "data/maps/SlateportCity_SternsShipyard_2F/map.bin"
 
-	.incbin "baserom.gba", 0x2d05b2, 0x2
-
+	.align 2
 SlateportCity_SternsShipyard_2F_MapAttributes:: @ 82D05B4
 	.4byte 0x11
 	.4byte 0xf
 	.4byte SlateportCity_SternsShipyard_2F_MapBorder
 	.4byte SlateportCity_SternsShipyard_2F_MapBlockdata
-	.4byte SlateportCity_SternsShipyard_2F_Tileset
-	.4byte SlateportCity_SternsShipyard_2F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 	.incbin "baserom.gba", 0x2d05cc, 0x48
 
@@ -1213,13 +1235,14 @@ SlateportCity_PokemonFanClub_MapBorder:: @ 82D0614
 SlateportCity_PokemonFanClub_MapBlockdata:: @ 82D061C
 	.incbin "data/maps/SlateportCity_PokemonFanClub/map.bin"
 
+	.align 2
 SlateportCity_PokemonFanClub_MapAttributes:: @ 82D0750
 	.4byte 0xe
 	.4byte 0xb
 	.4byte SlateportCity_PokemonFanClub_MapBorder
 	.4byte SlateportCity_PokemonFanClub_MapBlockdata
-	.4byte SlateportCity_PokemonFanClub_Tileset
-	.4byte SlateportCity_PokemonFanClub_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonFanClub
 
 SlateportCity_OceanicMuseum_1F_MapBorder:: @ 82D0768
 	.incbin "data/maps/SlateportCity_OceanicMuseum_1F/border.bin"
@@ -1227,13 +1250,14 @@ SlateportCity_OceanicMuseum_1F_MapBorder:: @ 82D0768
 SlateportCity_OceanicMuseum_1F_MapBlockdata:: @ 82D0770
 	.incbin "data/maps/SlateportCity_OceanicMuseum_1F/map.bin"
 
+	.align 2
 SlateportCity_OceanicMuseum_1F_MapAttributes:: @ 82D08D8
 	.4byte 0x14
 	.4byte 0x9
 	.4byte SlateportCity_OceanicMuseum_1F_MapBorder
 	.4byte SlateportCity_OceanicMuseum_1F_MapBlockdata
-	.4byte SlateportCity_OceanicMuseum_1F_Tileset
-	.4byte SlateportCity_OceanicMuseum_1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_OceanicMuseum
 
 SlateportCity_OceanicMuseum_2F_MapBorder:: @ 82D08F0
 	.incbin "data/maps/SlateportCity_OceanicMuseum_2F/border.bin"
@@ -1241,13 +1265,14 @@ SlateportCity_OceanicMuseum_2F_MapBorder:: @ 82D08F0
 SlateportCity_OceanicMuseum_2F_MapBlockdata:: @ 82D08F8
 	.incbin "data/maps/SlateportCity_OceanicMuseum_2F/map.bin"
 
+	.align 2
 SlateportCity_OceanicMuseum_2F_MapAttributes:: @ 82D0A60
 	.4byte 0x14
 	.4byte 0x9
 	.4byte SlateportCity_OceanicMuseum_2F_MapBorder
 	.4byte SlateportCity_OceanicMuseum_2F_MapBlockdata
-	.4byte SlateportCity_OceanicMuseum_2F_Tileset
-	.4byte SlateportCity_OceanicMuseum_2F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_OceanicMuseum
 
 SlateportCity_Harbor_MapBorder:: @ 82D0A78
 	.incbin "data/maps/SlateportCity_Harbor/border.bin"
@@ -1255,14 +1280,15 @@ SlateportCity_Harbor_MapBorder:: @ 82D0A78
 SlateportCity_Harbor_MapBlockdata:: @ 82D0A80
 	.incbin "data/maps/SlateportCity_Harbor/map.bin"
 
+	.align 2
 LilycoveCity_Harbor_MapAttributes:: @ 82D0D50
 SlateportCity_Harbor_MapAttributes:: @ 82D0D50
 	.4byte 0x18
 	.4byte 0xf
 	.4byte SlateportCity_Harbor_MapBorder
 	.4byte SlateportCity_Harbor_MapBlockdata
-	.4byte SlateportCity_Harbor_Tileset
-	.4byte SlateportCity_Harbor_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 MauvilleCity_Gym_MapBorder:: @ 82D0D68
 	.incbin "data/maps/MauvilleCity_Gym/border.bin"
@@ -1270,13 +1296,14 @@ MauvilleCity_Gym_MapBorder:: @ 82D0D68
 MauvilleCity_Gym_MapBlockdata:: @ 82D0D70
 	.incbin "data/maps/MauvilleCity_Gym/map.bin"
 
+	.align 2
 MauvilleCity_Gym_MapAttributes:: @ 82D0F14
 	.4byte 0xa
 	.4byte 0x15
 	.4byte MauvilleCity_Gym_MapBorder
 	.4byte MauvilleCity_Gym_MapBlockdata
-	.4byte MauvilleCity_Gym_Tileset
-	.4byte MauvilleCity_Gym_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_MauvilleGym
 
 MauvilleCity_BikeShop_MapBorder:: @ 82D0F2C
 	.incbin "data/maps/MauvilleCity_BikeShop/border.bin"
@@ -1284,13 +1311,14 @@ MauvilleCity_BikeShop_MapBorder:: @ 82D0F2C
 MauvilleCity_BikeShop_MapBlockdata:: @ 82D0F34
 	.incbin "data/maps/MauvilleCity_BikeShop/map.bin"
 
+	.align 2
 MauvilleCity_BikeShop_MapAttributes:: @ 82D100C
 	.4byte 0xc
 	.4byte 0x9
 	.4byte MauvilleCity_BikeShop_MapBorder
 	.4byte MauvilleCity_BikeShop_MapBlockdata
-	.4byte MauvilleCity_BikeShop_Tileset
-	.4byte MauvilleCity_BikeShop_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_BikeShop
 
 MauvilleCity_GameCorner_MapBorder:: @ 82D1024
 	.incbin "data/maps/MauvilleCity_GameCorner/border.bin"
@@ -1298,13 +1326,14 @@ MauvilleCity_GameCorner_MapBorder:: @ 82D1024
 MauvilleCity_GameCorner_MapBlockdata:: @ 82D102C
 	.incbin "data/maps/MauvilleCity_GameCorner/map.bin"
 
+	.align 2
 MauvilleCity_GameCorner_MapAttributes:: @ 82D1210
 	.4byte 0x16
 	.4byte 0xb
 	.4byte MauvilleCity_GameCorner_MapBorder
 	.4byte MauvilleCity_GameCorner_MapBlockdata
-	.4byte MauvilleCity_GameCorner_Tileset
-	.4byte MauvilleCity_GameCorner_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_MauvilleGameCorner
 
 RustboroCity_DevonCorp_1F_MapBorder:: @ 82D1228
 	.incbin "data/maps/RustboroCity_DevonCorp_1F/border.bin"
@@ -1312,15 +1341,14 @@ RustboroCity_DevonCorp_1F_MapBorder:: @ 82D1228
 RustboroCity_DevonCorp_1F_MapBlockdata:: @ 82D1230
 	.incbin "data/maps/RustboroCity_DevonCorp_1F/map.bin"
 
-	.incbin "baserom.gba", 0x2d1386, 0x2
-
+	.align 2
 RustboroCity_DevonCorp_1F_MapAttributes:: @ 82D1388
 	.4byte 0x13
 	.4byte 0x9
 	.4byte RustboroCity_DevonCorp_1F_MapBorder
 	.4byte RustboroCity_DevonCorp_1F_MapBlockdata
-	.4byte RustboroCity_DevonCorp_1F_Tileset
-	.4byte RustboroCity_DevonCorp_1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 RustboroCity_DevonCorp_2F_MapBorder:: @ 82D13A0
 	.incbin "data/maps/RustboroCity_DevonCorp_2F/border.bin"
@@ -1328,15 +1356,14 @@ RustboroCity_DevonCorp_2F_MapBorder:: @ 82D13A0
 RustboroCity_DevonCorp_2F_MapBlockdata:: @ 82D13A8
 	.incbin "data/maps/RustboroCity_DevonCorp_2F/map.bin"
 
-	.incbin "baserom.gba", 0x2d14fe, 0x2
-
+	.align 2
 RustboroCity_DevonCorp_2F_MapAttributes:: @ 82D1500
 	.4byte 0x13
 	.4byte 0x9
 	.4byte RustboroCity_DevonCorp_2F_MapBorder
 	.4byte RustboroCity_DevonCorp_2F_MapBlockdata
-	.4byte RustboroCity_DevonCorp_2F_Tileset
-	.4byte RustboroCity_DevonCorp_2F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 RustboroCity_Gym_MapBorder:: @ 82D1518
 	.incbin "data/maps/RustboroCity_Gym/border.bin"
@@ -1344,15 +1371,14 @@ RustboroCity_Gym_MapBorder:: @ 82D1518
 RustboroCity_Gym_MapBlockdata:: @ 82D1520
 	.incbin "data/maps/RustboroCity_Gym/map.bin"
 
-	.incbin "baserom.gba", 0x2d16c2, 0x2
-
+	.align 2
 RustboroCity_Gym_MapAttributes:: @ 82D16C4
 	.4byte 0xb
 	.4byte 0x13
 	.4byte RustboroCity_Gym_MapBorder
 	.4byte RustboroCity_Gym_MapBlockdata
-	.4byte RustboroCity_Gym_Tileset
-	.4byte RustboroCity_Gym_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_RustboroGym
 
 RustboroCity_PokemonSchool_MapBorder:: @ 82D16DC
 	.incbin "data/maps/RustboroCity_PokemonSchool/border.bin"
@@ -1360,13 +1386,14 @@ RustboroCity_PokemonSchool_MapBorder:: @ 82D16DC
 RustboroCity_PokemonSchool_MapBlockdata:: @ 82D16E4
 	.incbin "data/maps/RustboroCity_PokemonSchool/map.bin"
 
+	.align 2
 RustboroCity_PokemonSchool_MapAttributes:: @ 82D17EC
 	.4byte 0xc
 	.4byte 0xb
 	.4byte RustboroCity_PokemonSchool_MapBorder
 	.4byte RustboroCity_PokemonSchool_MapBlockdata
-	.4byte RustboroCity_PokemonSchool_Tileset
-	.4byte RustboroCity_PokemonSchool_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonSchool
 
 RustboroCity_House2_MapBorder:: @ 82D1804
 	.incbin "data/maps/RustboroCity_House2/border.bin"
@@ -1374,14 +1401,15 @@ RustboroCity_House2_MapBorder:: @ 82D1804
 RustboroCity_House2_MapBlockdata:: @ 82D180C
 	.incbin "data/maps/RustboroCity_House2/map.bin"
 
+	.align 2
 RustboroCity_House2_MapAttributes:: @ 82D18E4
 RustboroCity_House3_MapAttributes:: @ 82D18E4
 	.4byte 0xc
 	.4byte 0x9
 	.4byte RustboroCity_House2_MapBorder
 	.4byte RustboroCity_House2_MapBlockdata
-	.4byte RustboroCity_House2_Tileset
-	.4byte RustboroCity_House2_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 RustboroCity_House1_MapBorder:: @ 82D18FC
 	.incbin "data/maps/RustboroCity_House1/border.bin"
@@ -1389,13 +1417,14 @@ RustboroCity_House1_MapBorder:: @ 82D18FC
 RustboroCity_House1_MapBlockdata:: @ 82D1904
 	.incbin "data/maps/RustboroCity_House1/map.bin"
 
+	.align 2
 RustboroCity_House1_MapAttributes:: @ 82D19D4
 	.4byte 0xd
 	.4byte 0x8
 	.4byte RustboroCity_House1_MapBorder
 	.4byte RustboroCity_House1_MapBlockdata
-	.4byte RustboroCity_House1_Tileset
-	.4byte RustboroCity_House1_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 RustboroCity_CuttersHouse_MapBorder:: @ 82D19EC
 	.incbin "data/maps/RustboroCity_CuttersHouse/border.bin"
@@ -1403,15 +1432,14 @@ RustboroCity_CuttersHouse_MapBorder:: @ 82D19EC
 RustboroCity_CuttersHouse_MapBlockdata:: @ 82D19F4
 	.incbin "data/maps/RustboroCity_CuttersHouse/map.bin"
 
-	.incbin "baserom.gba", 0x2d1aba, 0x2
-
+	.align 2
 RustboroCity_CuttersHouse_MapAttributes:: @ 82D1ABC
 	.4byte 0xb
 	.4byte 0x9
 	.4byte RustboroCity_CuttersHouse_MapBorder
 	.4byte RustboroCity_CuttersHouse_MapBlockdata
-	.4byte RustboroCity_CuttersHouse_Tileset
-	.4byte RustboroCity_CuttersHouse_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 FortreeCity_House1_MapBorder:: @ 82D1AD4
 	.incbin "data/maps/FortreeCity_House1/border.bin"
@@ -1419,6 +1447,7 @@ FortreeCity_House1_MapBorder:: @ 82D1AD4
 FortreeCity_House1_MapBlockdata:: @ 82D1ADC
 	.incbin "data/maps/FortreeCity_House1/map.bin"
 
+	.align 2
 FortreeCity_House1_MapAttributes:: @ 82D1B3C
 FortreeCity_House3_MapAttributes:: @ 82D1B3C
 FortreeCity_House5_MapAttributes:: @ 82D1B3C
@@ -1426,8 +1455,8 @@ FortreeCity_House5_MapAttributes:: @ 82D1B3C
 	.4byte 0x6
 	.4byte FortreeCity_House1_MapBorder
 	.4byte FortreeCity_House1_MapBlockdata
-	.4byte FortreeCity_House1_Tileset
-	.4byte FortreeCity_House1_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 FortreeCity_Gym_MapBorder:: @ 82D1B54
 	.incbin "data/maps/FortreeCity_Gym/border.bin"
@@ -1435,13 +1464,14 @@ FortreeCity_Gym_MapBorder:: @ 82D1B54
 FortreeCity_Gym_MapBlockdata:: @ 82D1B5C
 	.incbin "data/maps/FortreeCity_Gym/map.bin"
 
+	.align 2
 FortreeCity_Gym_MapAttributes:: @ 82D1F44
 	.4byte 0x14
 	.4byte 0x19
 	.4byte FortreeCity_Gym_MapBorder
 	.4byte FortreeCity_Gym_MapBlockdata
-	.4byte FortreeCity_Gym_Tileset
-	.4byte FortreeCity_Gym_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_FortreeGym
 
 FortreeCity_House2_MapBorder:: @ 82D1F5C
 	.incbin "data/maps/FortreeCity_House2/border.bin"
@@ -1449,14 +1479,15 @@ FortreeCity_House2_MapBorder:: @ 82D1F5C
 FortreeCity_House2_MapBlockdata:: @ 82D1F64
 	.incbin "data/maps/FortreeCity_House2/map.bin"
 
+	.align 2
 FortreeCity_House2_MapAttributes:: @ 82D1FC4
 FortreeCity_House4_MapAttributes:: @ 82D1FC4
 	.4byte 0x8
 	.4byte 0x6
 	.4byte FortreeCity_House2_MapBorder
 	.4byte FortreeCity_House2_MapBlockdata
-	.4byte FortreeCity_House2_Tileset
-	.4byte FortreeCity_House2_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 Route104_MrBrineysHouse_MapBorder:: @ 82D1FDC
 	.incbin "data/maps/Route104_MrBrineysHouse/border.bin"
@@ -1464,13 +1495,14 @@ Route104_MrBrineysHouse_MapBorder:: @ 82D1FDC
 Route104_MrBrineysHouse_MapBlockdata:: @ 82D1FE4
 	.incbin "data/maps/Route104_MrBrineysHouse/map.bin"
 
+	.align 2
 Route104_MrBrineysHouse_MapAttributes:: @ 82D20BC
 	.4byte 0xc
 	.4byte 0x9
 	.4byte Route104_MrBrineysHouse_MapBorder
 	.4byte Route104_MrBrineysHouse_MapBlockdata
-	.4byte Route104_MrBrineysHouse_Tileset
-	.4byte Route104_MrBrineysHouse_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 LilycoveCity_LilycoveMuseum_1F_MapBorder:: @ 82D20D4
 	.incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin"
@@ -1478,13 +1510,14 @@ LilycoveCity_LilycoveMuseum_1F_MapBorder:: @ 82D20D4
 LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: @ 82D20DC
 	.incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin"
 
+	.align 2
 LilycoveCity_LilycoveMuseum_1F_MapAttributes:: @ 82D2328
 	.4byte 0x15
 	.4byte 0xe
 	.4byte LilycoveCity_LilycoveMuseum_1F_MapBorder
 	.4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata
-	.4byte LilycoveCity_LilycoveMuseum_1F_Tileset
-	.4byte LilycoveCity_LilycoveMuseum_1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_LilycoveMuseum
 
 LilycoveCity_LilycoveMuseum_2F_MapBorder:: @ 82D2340
 	.incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin"
@@ -1492,13 +1525,14 @@ LilycoveCity_LilycoveMuseum_2F_MapBorder:: @ 82D2340
 LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: @ 82D2348
 	.incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin"
 
+	.align 2
 LilycoveCity_LilycoveMuseum_2F_MapAttributes:: @ 82D2584
 	.4byte 0x16
 	.4byte 0xd
 	.4byte LilycoveCity_LilycoveMuseum_2F_MapBorder
 	.4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata
-	.4byte LilycoveCity_LilycoveMuseum_2F_Tileset
-	.4byte LilycoveCity_LilycoveMuseum_2F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_LilycoveMuseum
 
 LilycoveCity_ContestLobby_MapBorder:: @ 82D259C
 	.incbin "data/maps/LilycoveCity_ContestLobby/border.bin"
@@ -1506,13 +1540,14 @@ LilycoveCity_ContestLobby_MapBorder:: @ 82D259C
 LilycoveCity_ContestLobby_MapBlockdata:: @ 82D25A4
 	.incbin "data/maps/LilycoveCity_ContestLobby/map.bin"
 
+	.align 2
 LilycoveCity_ContestLobby_MapAttributes:: @ 82D27CC
 	.4byte 0x17
 	.4byte 0xc
 	.4byte LilycoveCity_ContestLobby_MapBorder
 	.4byte LilycoveCity_ContestLobby_MapBlockdata
-	.4byte LilycoveCity_ContestLobby_Tileset
-	.4byte LilycoveCity_ContestLobby_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
 
 LilycoveCity_ContestHall_MapBorder:: @ 82D27E4
 	.incbin "data/maps/LilycoveCity_ContestHall/border.bin"
@@ -1520,15 +1555,14 @@ LilycoveCity_ContestHall_MapBorder:: @ 82D27E4
 LilycoveCity_ContestHall_MapBlockdata:: @ 82D27EC
 	.incbin "data/maps/LilycoveCity_ContestHall/map.bin"
 
-	.incbin "baserom.gba", 0x2d3512, 0x2
-
+	.align 2
 LilycoveCity_ContestHall_MapAttributes:: @ 82D3514
 	.4byte 0x33
 	.4byte 0x21
 	.4byte LilycoveCity_ContestHall_MapBorder
 	.4byte LilycoveCity_ContestHall_MapBlockdata
-	.4byte LilycoveCity_ContestHall_Tileset
-	.4byte LilycoveCity_ContestHall_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
 
 LilycoveCity_PokemonTrainerFanClub_MapBorder:: @ 82D352C
 	.incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin"
@@ -1536,13 +1570,14 @@ LilycoveCity_PokemonTrainerFanClub_MapBorder:: @ 82D352C
 LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: @ 82D3534
 	.incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin"
 
+	.align 2
 LilycoveCity_PokemonTrainerFanClub_MapAttributes:: @ 82D3684
 	.4byte 0xc
 	.4byte 0xe
 	.4byte LilycoveCity_PokemonTrainerFanClub_MapBorder
 	.4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata
-	.4byte LilycoveCity_PokemonTrainerFanClub_Tileset
-	.4byte LilycoveCity_PokemonTrainerFanClub_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 LilycoveCity_EmptyMap_MapBorder:: @ 82D369C
 	.incbin "data/maps/LilycoveCity_EmptyMap/border.bin"
@@ -1550,15 +1585,14 @@ LilycoveCity_EmptyMap_MapBorder:: @ 82D369C
 LilycoveCity_EmptyMap_MapBlockdata:: @ 82D36A4
 	.incbin "data/maps/LilycoveCity_EmptyMap/map.bin"
 
-	.incbin "baserom.gba", 0x2d36a6, 0x2
-
+	.align 2
 LilycoveCity_EmptyMap_MapAttributes:: @ 82D36A8
 	.4byte 0x1
 	.4byte 0x1
 	.4byte LilycoveCity_EmptyMap_MapBorder
 	.4byte LilycoveCity_EmptyMap_MapBlockdata
-	.4byte LilycoveCity_EmptyMap_Tileset
-	.4byte LilycoveCity_EmptyMap_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 MossdeepCity_Gym_MapBorder:: @ 82D36C0
 	.incbin "data/maps/MossdeepCity_Gym/border.bin"
@@ -1566,13 +1600,14 @@ MossdeepCity_Gym_MapBorder:: @ 82D36C0
 MossdeepCity_Gym_MapBlockdata:: @ 82D36C8
 	.incbin "data/maps/MossdeepCity_Gym/map.bin"
 
+	.align 2
 MossdeepCity_Gym_MapAttributes:: @ 82D3B78
 	.4byte 0x14
 	.4byte 0x1e
 	.4byte MossdeepCity_Gym_MapBorder
 	.4byte MossdeepCity_Gym_MapBlockdata
-	.4byte MossdeepCity_Gym_Tileset
-	.4byte MossdeepCity_Gym_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_MossdeepGym
 
 SootopolisCity_Gym_1F_MapBorder:: @ 82D3B90
 	.incbin "data/maps/SootopolisCity_Gym_1F/border.bin"
@@ -1580,13 +1615,14 @@ SootopolisCity_Gym_1F_MapBorder:: @ 82D3B90
 SootopolisCity_Gym_1F_MapBlockdata:: @ 82D3B98
 	.incbin "data/maps/SootopolisCity_Gym_1F/map.bin"
 
+	.align 2
 SootopolisCity_Gym_1F_MapAttributes:: @ 82D3F0C
 	.4byte 0x11
 	.4byte 0x1a
 	.4byte SootopolisCity_Gym_1F_MapBorder
 	.4byte SootopolisCity_Gym_1F_MapBlockdata
-	.4byte SootopolisCity_Gym_1F_Tileset
-	.4byte SootopolisCity_Gym_1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_SootopolisGym
 
 SootopolisCity_Gym_B1F_MapBorder:: @ 82D3F24
 	.incbin "data/maps/SootopolisCity_Gym_B1F/border.bin"
@@ -1594,13 +1630,14 @@ SootopolisCity_Gym_B1F_MapBorder:: @ 82D3F24
 SootopolisCity_Gym_B1F_MapBlockdata:: @ 82D3F2C
 	.incbin "data/maps/SootopolisCity_Gym_B1F/map.bin"
 
+	.align 2
 SootopolisCity_Gym_B1F_MapAttributes:: @ 82D42A0
 	.4byte 0x11
 	.4byte 0x1a
 	.4byte SootopolisCity_Gym_B1F_MapBorder
 	.4byte SootopolisCity_Gym_B1F_MapBlockdata
-	.4byte SootopolisCity_Gym_B1F_Tileset
-	.4byte SootopolisCity_Gym_B1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_SootopolisGym
 
 EverGrandeCity_SidneysRoom_MapBorder:: @ 82D42B8
 	.incbin "data/maps/EverGrandeCity_SidneysRoom/border.bin"
@@ -1608,13 +1645,14 @@ EverGrandeCity_SidneysRoom_MapBorder:: @ 82D42B8
 EverGrandeCity_SidneysRoom_MapBlockdata:: @ 82D42C0
 	.incbin "data/maps/EverGrandeCity_SidneysRoom/map.bin"
 
+	.align 2
 EverGrandeCity_SidneysRoom_MapAttributes:: @ 82D442C
 	.4byte 0xd
 	.4byte 0xe
 	.4byte EverGrandeCity_SidneysRoom_MapBorder
 	.4byte EverGrandeCity_SidneysRoom_MapBlockdata
-	.4byte EverGrandeCity_SidneysRoom_Tileset
-	.4byte EverGrandeCity_SidneysRoom_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
 
 EverGrandeCity_PhoebesRoom_MapBorder:: @ 82D4444
 	.incbin "data/maps/EverGrandeCity_PhoebesRoom/border.bin"
@@ -1622,13 +1660,14 @@ EverGrandeCity_PhoebesRoom_MapBorder:: @ 82D4444
 EverGrandeCity_PhoebesRoom_MapBlockdata:: @ 82D444C
 	.incbin "data/maps/EverGrandeCity_PhoebesRoom/map.bin"
 
+	.align 2
 EverGrandeCity_PhoebesRoom_MapAttributes:: @ 82D45B8
 	.4byte 0xd
 	.4byte 0xe
 	.4byte EverGrandeCity_PhoebesRoom_MapBorder
 	.4byte EverGrandeCity_PhoebesRoom_MapBlockdata
-	.4byte EverGrandeCity_PhoebesRoom_Tileset
-	.4byte EverGrandeCity_PhoebesRoom_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
 
 EverGrandeCity_GlaciasRoom_MapBorder:: @ 82D45D0
 	.incbin "data/maps/EverGrandeCity_GlaciasRoom/border.bin"
@@ -1636,13 +1675,14 @@ EverGrandeCity_GlaciasRoom_MapBorder:: @ 82D45D0
 EverGrandeCity_GlaciasRoom_MapBlockdata:: @ 82D45D8
 	.incbin "data/maps/EverGrandeCity_GlaciasRoom/map.bin"
 
+	.align 2
 EverGrandeCity_GlaciasRoom_MapAttributes:: @ 82D4744
 	.4byte 0xd
 	.4byte 0xe
 	.4byte EverGrandeCity_GlaciasRoom_MapBorder
 	.4byte EverGrandeCity_GlaciasRoom_MapBlockdata
-	.4byte EverGrandeCity_GlaciasRoom_Tileset
-	.4byte EverGrandeCity_GlaciasRoom_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
 
 EverGrandeCity_DrakesRoom_MapBorder:: @ 82D475C
 	.incbin "data/maps/EverGrandeCity_DrakesRoom/border.bin"
@@ -1650,13 +1690,14 @@ EverGrandeCity_DrakesRoom_MapBorder:: @ 82D475C
 EverGrandeCity_DrakesRoom_MapBlockdata:: @ 82D4764
 	.incbin "data/maps/EverGrandeCity_DrakesRoom/map.bin"
 
+	.align 2
 EverGrandeCity_DrakesRoom_MapAttributes:: @ 82D48D0
 	.4byte 0xd
 	.4byte 0xe
 	.4byte EverGrandeCity_DrakesRoom_MapBorder
 	.4byte EverGrandeCity_DrakesRoom_MapBlockdata
-	.4byte EverGrandeCity_DrakesRoom_Tileset
-	.4byte EverGrandeCity_DrakesRoom_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
 
 EverGrandeCity_ChampionsRoom_MapBorder:: @ 82D48E8
 	.incbin "data/maps/EverGrandeCity_ChampionsRoom/border.bin"
@@ -1664,15 +1705,14 @@ EverGrandeCity_ChampionsRoom_MapBorder:: @ 82D48E8
 EverGrandeCity_ChampionsRoom_MapBlockdata:: @ 82D48F0
 	.incbin "data/maps/EverGrandeCity_ChampionsRoom/map.bin"
 
-	.incbin "baserom.gba", 0x2d4a42, 0x2
-
+	.align 2
 EverGrandeCity_ChampionsRoom_MapAttributes:: @ 82D4A44
 	.4byte 0xd
 	.4byte 0xd
 	.4byte EverGrandeCity_ChampionsRoom_MapBorder
 	.4byte EverGrandeCity_ChampionsRoom_MapBlockdata
-	.4byte EverGrandeCity_ChampionsRoom_Tileset
-	.4byte EverGrandeCity_ChampionsRoom_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
 
 EverGrandeCity_Corridor1_MapBorder:: @ 82D4A5C
 	.incbin "data/maps/EverGrandeCity_Corridor1/border.bin"
@@ -1680,8 +1720,7 @@ EverGrandeCity_Corridor1_MapBorder:: @ 82D4A5C
 EverGrandeCity_Corridor1_MapBlockdata:: @ 82D4A64
 	.incbin "data/maps/EverGrandeCity_Corridor1/map.bin"
 
-	.incbin "baserom.gba", 0x2d4b82, 0x2
-
+	.align 2
 EverGrandeCity_Corridor1_MapAttributes:: @ 82D4B84
 EverGrandeCity_Corridor2_MapAttributes:: @ 82D4B84
 EverGrandeCity_Corridor3_MapAttributes:: @ 82D4B84
@@ -1690,8 +1729,8 @@ EverGrandeCity_Corridor5_MapAttributes:: @ 82D4B84
 	.4byte 0xd
 	.4byte EverGrandeCity_Corridor1_MapBorder
 	.4byte EverGrandeCity_Corridor1_MapBlockdata
-	.4byte EverGrandeCity_Corridor1_Tileset
-	.4byte EverGrandeCity_Corridor1_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
 
 Route104_PrettyPetalFlowerShop_MapBorder:: @ 82D4B9C
 	.incbin "data/maps/Route104_PrettyPetalFlowerShop/border.bin"
@@ -1699,16 +1738,15 @@ Route104_PrettyPetalFlowerShop_MapBorder:: @ 82D4B9C
 Route104_PrettyPetalFlowerShop_MapBlockdata:: @ 82D4BA4
 	.incbin "data/maps/Route104_PrettyPetalFlowerShop/map.bin"
 
-	.incbin "baserom.gba", 0x2d4cb2, 0x2
-
+	.align 2
 Route104_PrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4
 Route104_PrototypePrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4
 	.4byte 0xf
 	.4byte 0x9
 	.4byte Route104_PrettyPetalFlowerShop_MapBorder
 	.4byte Route104_PrettyPetalFlowerShop_MapBlockdata
-	.4byte Route104_PrettyPetalFlowerShop_Tileset
-	.4byte Route104_PrettyPetalFlowerShop_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_PrettyPetalFlowerShop
 
 Route112_CableCarStation_MapBorder:: @ 82D4CCC
 	.incbin "data/maps/Route112_CableCarStation/border.bin"
@@ -1716,14 +1754,15 @@ Route112_CableCarStation_MapBorder:: @ 82D4CCC
 Route112_CableCarStation_MapBlockdata:: @ 82D4CD4
 	.incbin "data/maps/Route112_CableCarStation/map.bin"
 
+	.align 2
 MtChimney_CableCarStation_MapAttributes:: @ 82D4E0C
 Route112_CableCarStation_MapAttributes:: @ 82D4E0C
 	.4byte 0xd
 	.4byte 0xc
 	.4byte Route112_CableCarStation_MapBorder
 	.4byte Route112_CableCarStation_MapBlockdata
-	.4byte Route112_CableCarStation_Tileset
-	.4byte Route112_CableCarStation_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 Route114_FossilManiacsHouse_MapBorder:: @ 82D4E24
 	.incbin "data/maps/Route114_FossilManiacsHouse/border.bin"
@@ -1731,13 +1770,14 @@ Route114_FossilManiacsHouse_MapBorder:: @ 82D4E24
 Route114_FossilManiacsHouse_MapBlockdata:: @ 82D4E2C
 	.incbin "data/maps/Route114_FossilManiacsHouse/map.bin"
 
+	.align 2
 Route114_FossilManiacsHouse_MapAttributes:: @ 82D4ECC
 	.4byte 0xa
 	.4byte 0x8
 	.4byte Route114_FossilManiacsHouse_MapBorder
 	.4byte Route114_FossilManiacsHouse_MapBlockdata
-	.4byte Route114_FossilManiacsHouse_Tileset
-	.4byte Route114_FossilManiacsHouse_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 Route114_FossilManiacsTunnel_MapBorder:: @ 82D4EE4
 	.incbin "data/maps/Route114_FossilManiacsTunnel/border.bin"
@@ -1745,13 +1785,14 @@ Route114_FossilManiacsTunnel_MapBorder:: @ 82D4EE4
 Route114_FossilManiacsTunnel_MapBlockdata:: @ 82D4EEC
 	.incbin "data/maps/Route114_FossilManiacsTunnel/map.bin"
 
+	.align 2
 Route114_FossilManiacsTunnel_MapAttributes:: @ 82D5190
 	.4byte 0xd
 	.4byte 0x1a
 	.4byte Route114_FossilManiacsTunnel_MapBorder
 	.4byte Route114_FossilManiacsTunnel_MapBlockdata
-	.4byte Route114_FossilManiacsTunnel_Tileset
-	.4byte Route114_FossilManiacsTunnel_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
 
 Route114_LanettesHouse_MapBorder:: @ 82D51A8
 	.incbin "data/maps/Route114_LanettesHouse/border.bin"
@@ -1759,13 +1800,14 @@ Route114_LanettesHouse_MapBorder:: @ 82D51A8
 Route114_LanettesHouse_MapBlockdata:: @ 82D51B0
 	.incbin "data/maps/Route114_LanettesHouse/map.bin"
 
+	.align 2
 Route114_LanettesHouse_MapAttributes:: @ 82D5260
 	.4byte 0xb
 	.4byte 0x8
 	.4byte Route114_LanettesHouse_MapBorder
 	.4byte Route114_LanettesHouse_MapBlockdata
-	.4byte Route114_LanettesHouse_Tileset
-	.4byte Route114_LanettesHouse_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
 
 Route116_TunnelersRestHouse_MapBorder:: @ 82D5278
 	.incbin "data/maps/Route116_TunnelersRestHouse/border.bin"
@@ -1773,13 +1815,14 @@ Route116_TunnelersRestHouse_MapBorder:: @ 82D5278
 Route116_TunnelersRestHouse_MapBlockdata:: @ 82D5280
 	.incbin "data/maps/Route116_TunnelersRestHouse/map.bin"
 
+	.align 2
 Route116_TunnelersRestHouse_MapAttributes:: @ 82D5334
 	.4byte 0xa
 	.4byte 0x9
 	.4byte Route116_TunnelersRestHouse_MapBorder
 	.4byte Route116_TunnelersRestHouse_MapBlockdata
-	.4byte Route116_TunnelersRestHouse_Tileset
-	.4byte Route116_TunnelersRestHouse_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 Route117_PokemonDayCare_MapBorder:: @ 82D534C
 	.incbin "data/maps/Route117_PokemonDayCare/border.bin"
@@ -1787,13 +1830,14 @@ Route117_PokemonDayCare_MapBorder:: @ 82D534C
 Route117_PokemonDayCare_MapBlockdata:: @ 82D5354
 	.incbin "data/maps/Route117_PokemonDayCare/map.bin"
 
+	.align 2
 Route117_PokemonDayCare_MapAttributes:: @ 82D542C
 	.4byte 0xc
 	.4byte 0x9
 	.4byte Route117_PokemonDayCare_MapBorder
 	.4byte Route117_PokemonDayCare_MapBlockdata
-	.4byte Route117_PokemonDayCare_Tileset
-	.4byte Route117_PokemonDayCare_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonDayCare
 
 Route121_SafariZoneEntrance_MapBorder:: @ 82D5444
 	.incbin "data/maps/Route121_SafariZoneEntrance/border.bin"
@@ -1801,13 +1845,14 @@ Route121_SafariZoneEntrance_MapBorder:: @ 82D5444
 Route121_SafariZoneEntrance_MapBlockdata:: @ 82D544C
 	.incbin "data/maps/Route121_SafariZoneEntrance/map.bin"
 
+	.align 2
 Route121_SafariZoneEntrance_MapAttributes:: @ 82D5644
 	.4byte 0x12
 	.4byte 0xe
 	.4byte Route121_SafariZoneEntrance_MapBorder
 	.4byte Route121_SafariZoneEntrance_MapBlockdata
-	.4byte Route121_SafariZoneEntrance_Tileset
-	.4byte Route121_SafariZoneEntrance_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
 
 MeteorFalls_1F_1R_MapBorder:: @ 82D565C
 	.incbin "data/maps/MeteorFalls_1F_1R/border.bin"
@@ -1815,13 +1860,14 @@ MeteorFalls_1F_1R_MapBorder:: @ 82D565C
 MeteorFalls_1F_1R_MapBlockdata:: @ 82D5664
 	.incbin "data/maps/MeteorFalls_1F_1R/map.bin"
 
+	.align 2
 MeteorFalls_1F_1R_MapAttributes:: @ 82D603C
 	.4byte 0x1e
 	.4byte 0x2a
 	.4byte MeteorFalls_1F_1R_MapBorder
 	.4byte MeteorFalls_1F_1R_MapBlockdata
-	.4byte MeteorFalls_1F_1R_Tileset
-	.4byte MeteorFalls_1F_1R_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
 
 MeteorFalls_1F_2R_MapBorder:: @ 82D6054
 	.incbin "data/maps/MeteorFalls_1F_2R/border.bin"
@@ -1829,13 +1875,14 @@ MeteorFalls_1F_2R_MapBorder:: @ 82D6054
 MeteorFalls_1F_2R_MapBlockdata:: @ 82D605C
 	.incbin "data/maps/MeteorFalls_1F_2R/map.bin"
 
+	.align 2
 MeteorFalls_1F_2R_MapAttributes:: @ 82D67DC
 	.4byte 0x1e
 	.4byte 0x20
 	.4byte MeteorFalls_1F_2R_MapBorder
 	.4byte MeteorFalls_1F_2R_MapBlockdata
-	.4byte MeteorFalls_1F_2R_Tileset
-	.4byte MeteorFalls_1F_2R_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
 
 MeteorFalls_B1F_1R_MapBorder:: @ 82D67F4
 	.incbin "data/maps/MeteorFalls_B1F_1R/border.bin"
@@ -1843,13 +1890,14 @@ MeteorFalls_B1F_1R_MapBorder:: @ 82D67F4
 MeteorFalls_B1F_1R_MapBlockdata:: @ 82D67FC
 	.incbin "data/maps/MeteorFalls_B1F_1R/map.bin"
 
+	.align 2
 MeteorFalls_B1F_1R_MapAttributes:: @ 82D7098
 	.4byte 0x1d
 	.4byte 0x26
 	.4byte MeteorFalls_B1F_1R_MapBorder
 	.4byte MeteorFalls_B1F_1R_MapBlockdata
-	.4byte MeteorFalls_B1F_1R_Tileset
-	.4byte MeteorFalls_B1F_1R_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
 
 MeteorFalls_B1F_2R_MapBorder:: @ 82D70B0
 	.incbin "data/maps/MeteorFalls_B1F_2R/border.bin"
@@ -1857,13 +1905,14 @@ MeteorFalls_B1F_2R_MapBorder:: @ 82D70B0
 MeteorFalls_B1F_2R_MapBlockdata:: @ 82D70B8
 	.incbin "data/maps/MeteorFalls_B1F_2R/map.bin"
 
+	.align 2
 MeteorFalls_B1F_2R_MapAttributes:: @ 82D7244
 	.4byte 0xb
 	.4byte 0x12
 	.4byte MeteorFalls_B1F_2R_MapBorder
 	.4byte MeteorFalls_B1F_2R_MapBlockdata
-	.4byte MeteorFalls_B1F_2R_Tileset
-	.4byte MeteorFalls_B1F_2R_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
 
 RusturfTunnel_MapBorder:: @ 82D725C
 	.incbin "data/maps/RusturfTunnel/border.bin"
@@ -1871,13 +1920,14 @@ RusturfTunnel_MapBorder:: @ 82D725C
 RusturfTunnel_MapBlockdata:: @ 82D7264
 	.incbin "data/maps/RusturfTunnel/map.bin"
 
+	.align 2
 RusturfTunnel_MapAttributes:: @ 82D7924
 	.4byte 0x24
 	.4byte 0x18
 	.4byte RusturfTunnel_MapBorder
 	.4byte RusturfTunnel_MapBlockdata
-	.4byte RusturfTunnel_Tileset
-	.4byte RusturfTunnel_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_RusturfTunnel
 
 Underwater_SootopolisCity_MapBorder:: @ 82D793C
 	.incbin "data/maps/Underwater_SootopolisCity/border.bin"
@@ -1885,13 +1935,14 @@ Underwater_SootopolisCity_MapBorder:: @ 82D793C
 Underwater_SootopolisCity_MapBlockdata:: @ 82D7944
 	.incbin "data/maps/Underwater_SootopolisCity/map.bin"
 
+	.align 2
 Underwater_SootopolisCity_MapAttributes:: @ 82D7AD4
 	.4byte 0x14
 	.4byte 0xa
 	.4byte Underwater_SootopolisCity_MapBorder
 	.4byte Underwater_SootopolisCity_MapBlockdata
-	.4byte Underwater_SootopolisCity_Tileset
-	.4byte Underwater_SootopolisCity_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
 
 DesertRuins_MapBorder:: @ 82D7AEC
 	.incbin "data/maps/DesertRuins/border.bin"
@@ -1899,15 +1950,14 @@ DesertRuins_MapBorder:: @ 82D7AEC
 DesertRuins_MapBlockdata:: @ 82D7AF4
 	.incbin "data/maps/DesertRuins/map.bin"
 
-	.incbin "baserom.gba", 0x2d7f56, 0x2
-
+	.align 2
 DesertRuins_MapAttributes:: @ 82D7F58
 	.4byte 0x11
 	.4byte 0x21
 	.4byte DesertRuins_MapBorder
 	.4byte DesertRuins_MapBlockdata
-	.4byte DesertRuins_Tileset
-	.4byte DesertRuins_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 GraniteCave_1F_MapBorder:: @ 82D7F70
 	.incbin "data/maps/GraniteCave_1F/border.bin"
@@ -1915,13 +1965,14 @@ GraniteCave_1F_MapBorder:: @ 82D7F70
 GraniteCave_1F_MapBlockdata:: @ 82D7F78
 	.incbin "data/maps/GraniteCave_1F/map.bin"
 
+	.align 2
 GraniteCave_1F_MapAttributes:: @ 82D8464
 	.4byte 0x2a
 	.4byte 0xf
 	.4byte GraniteCave_1F_MapBorder
 	.4byte GraniteCave_1F_MapBlockdata
-	.4byte GraniteCave_1F_Tileset
-	.4byte GraniteCave_1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 GraniteCave_B1F_MapBorder:: @ 82D847C
 	.incbin "data/maps/GraniteCave_B1F/border.bin"
@@ -1929,13 +1980,14 @@ GraniteCave_B1F_MapBorder:: @ 82D847C
 GraniteCave_B1F_MapBlockdata:: @ 82D8484
 	.incbin "data/maps/GraniteCave_B1F/map.bin"
 
+	.align 2
 GraniteCave_B1F_MapAttributes:: @ 82D8B04
 	.4byte 0x20
 	.4byte 0x1a
 	.4byte GraniteCave_B1F_MapBorder
 	.4byte GraniteCave_B1F_MapBlockdata
-	.4byte GraniteCave_B1F_Tileset
-	.4byte GraniteCave_B1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 GraniteCave_B2F_MapBorder:: @ 82D8B1C
 	.incbin "data/maps/GraniteCave_B2F/border.bin"
@@ -1943,13 +1995,14 @@ GraniteCave_B2F_MapBorder:: @ 82D8B1C
 GraniteCave_B2F_MapBlockdata:: @ 82D8B24
 	.incbin "data/maps/GraniteCave_B2F/map.bin"
 
+	.align 2
 GraniteCave_B2F_MapAttributes:: @ 82D91A4
 	.4byte 0x20
 	.4byte 0x1a
 	.4byte GraniteCave_B2F_MapBorder
 	.4byte GraniteCave_B2F_MapBlockdata
-	.4byte GraniteCave_B2F_Tileset
-	.4byte GraniteCave_B2F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 PetalburgWoods_MapBorder:: @ 82D91BC
 	.incbin "data/maps/PetalburgWoods/border.bin"
@@ -1957,13 +2010,14 @@ PetalburgWoods_MapBorder:: @ 82D91BC
 PetalburgWoods_MapBlockdata:: @ 82D91C4
 	.incbin "data/maps/PetalburgWoods/map.bin"
 
+	.align 2
 PetalburgWoods_MapAttributes:: @ 82DA244
 	.4byte 0x30
 	.4byte 0x2c
 	.4byte PetalburgWoods_MapBorder
 	.4byte PetalburgWoods_MapBlockdata
-	.4byte PetalburgWoods_Tileset
-	.4byte PetalburgWoods_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
 
 MtChimney_MapBorder:: @ 82DA25C
 	.incbin "data/maps/MtChimney/border.bin"
@@ -1971,13 +2025,14 @@ MtChimney_MapBorder:: @ 82DA25C
 MtChimney_MapBlockdata:: @ 82DA264
 	.incbin "data/maps/MtChimney/map.bin"
 
+	.align 2
 MtChimney_MapAttributes:: @ 82DB114
 	.4byte 0x28
 	.4byte 0x2f
 	.4byte MtChimney_MapBorder
 	.4byte MtChimney_MapBlockdata
-	.4byte MtChimney_Tileset
-	.4byte MtChimney_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
 
 MtPyre_1F_MapBorder:: @ 82DB12C
 	.incbin "data/maps/MtPyre_1F/border.bin"
@@ -1985,13 +2040,14 @@ MtPyre_1F_MapBorder:: @ 82DB12C
 MtPyre_1F_MapBlockdata:: @ 82DB134
 	.incbin "data/maps/MtPyre_1F/map.bin"
 
+	.align 2
 MtPyre_1F_MapAttributes:: @ 82DB478
 	.4byte 0x16
 	.4byte 0x13
 	.4byte MtPyre_1F_MapBorder
 	.4byte MtPyre_1F_MapBlockdata
-	.4byte MtPyre_1F_Tileset
-	.4byte MtPyre_1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 MtPyre_2F_MapBorder:: @ 82DB490
 	.incbin "data/maps/MtPyre_2F/border.bin"
@@ -1999,15 +2055,14 @@ MtPyre_2F_MapBorder:: @ 82DB490
 MtPyre_2F_MapBlockdata:: @ 82DB498
 	.incbin "data/maps/MtPyre_2F/map.bin"
 
-	.incbin "baserom.gba", 0x2db5ea, 0x2
-
+	.align 2
 MtPyre_2F_MapAttributes:: @ 82DB5EC
 	.4byte 0xd
 	.4byte 0xd
 	.4byte MtPyre_2F_MapBorder
 	.4byte MtPyre_2F_MapBlockdata
-	.4byte MtPyre_2F_Tileset
-	.4byte MtPyre_2F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 MtPyre_3F_MapBorder:: @ 82DB604
 	.incbin "data/maps/MtPyre_3F/border.bin"
@@ -2015,15 +2070,14 @@ MtPyre_3F_MapBorder:: @ 82DB604
 MtPyre_3F_MapBlockdata:: @ 82DB60C
 	.incbin "data/maps/MtPyre_3F/map.bin"
 
-	.incbin "baserom.gba", 0x2db75e, 0x2
-
+	.align 2
 MtPyre_3F_MapAttributes:: @ 82DB760
 	.4byte 0xd
 	.4byte 0xd
 	.4byte MtPyre_3F_MapBorder
 	.4byte MtPyre_3F_MapBlockdata
-	.4byte MtPyre_3F_Tileset
-	.4byte MtPyre_3F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 MtPyre_4F_MapBorder:: @ 82DB778
 	.incbin "data/maps/MtPyre_4F/border.bin"
@@ -2031,15 +2085,14 @@ MtPyre_4F_MapBorder:: @ 82DB778
 MtPyre_4F_MapBlockdata:: @ 82DB780
 	.incbin "data/maps/MtPyre_4F/map.bin"
 
-	.incbin "baserom.gba", 0x2db8d2, 0x2
-
+	.align 2
 MtPyre_4F_MapAttributes:: @ 82DB8D4
 	.4byte 0xd
 	.4byte 0xd
 	.4byte MtPyre_4F_MapBorder
 	.4byte MtPyre_4F_MapBlockdata
-	.4byte MtPyre_4F_Tileset
-	.4byte MtPyre_4F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 MtPyre_5F_MapBorder:: @ 82DB8EC
 	.incbin "data/maps/MtPyre_5F/border.bin"
@@ -2047,15 +2100,14 @@ MtPyre_5F_MapBorder:: @ 82DB8EC
 MtPyre_5F_MapBlockdata:: @ 82DB8F4
 	.incbin "data/maps/MtPyre_5F/map.bin"
 
-	.incbin "baserom.gba", 0x2dba46, 0x2
-
+	.align 2
 MtPyre_5F_MapAttributes:: @ 82DBA48
 	.4byte 0xd
 	.4byte 0xd
 	.4byte MtPyre_5F_MapBorder
 	.4byte MtPyre_5F_MapBlockdata
-	.4byte MtPyre_5F_Tileset
-	.4byte MtPyre_5F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 MtPyre_6F_MapBorder:: @ 82DBA60
 	.incbin "data/maps/MtPyre_6F/border.bin"
@@ -2063,15 +2115,14 @@ MtPyre_6F_MapBorder:: @ 82DBA60
 MtPyre_6F_MapBlockdata:: @ 82DBA68
 	.incbin "data/maps/MtPyre_6F/map.bin"
 
-	.incbin "baserom.gba", 0x2dbbba, 0x2
-
+	.align 2
 MtPyre_6F_MapAttributes:: @ 82DBBBC
 	.4byte 0xd
 	.4byte 0xd
 	.4byte MtPyre_6F_MapBorder
 	.4byte MtPyre_6F_MapBlockdata
-	.4byte MtPyre_6F_Tileset
-	.4byte MtPyre_6F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 AquaHideout_1F_MapBorder:: @ 82DBBD4
 	.incbin "data/maps/AquaHideout_1F/border.bin"
@@ -2079,13 +2130,14 @@ AquaHideout_1F_MapBorder:: @ 82DBBD4
 AquaHideout_1F_MapBlockdata:: @ 82DBBDC
 	.incbin "data/maps/AquaHideout_1F/map.bin"
 
+	.align 2
 AquaHideout_1F_MapAttributes:: @ 82DC26C
 	.4byte 0x1c
 	.4byte 0x1e
 	.4byte AquaHideout_1F_MapBorder
 	.4byte AquaHideout_1F_MapBlockdata
-	.4byte AquaHideout_1F_Tileset
-	.4byte AquaHideout_1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 AquaHideout_B1F_MapBorder:: @ 82DC284
 	.incbin "data/maps/AquaHideout_B1F/border.bin"
@@ -2093,13 +2145,14 @@ AquaHideout_B1F_MapBorder:: @ 82DC284
 AquaHideout_B1F_MapBlockdata:: @ 82DC28C
 	.incbin "data/maps/AquaHideout_B1F/map.bin"
 
+	.align 2
 AquaHideout_B1F_MapAttributes:: @ 82DCC1C
 	.4byte 0x33
 	.4byte 0x18
 	.4byte AquaHideout_B1F_MapBorder
 	.4byte AquaHideout_B1F_MapBlockdata
-	.4byte AquaHideout_B1F_Tileset
-	.4byte AquaHideout_B1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 AquaHideout_B2F_MapBorder:: @ 82DCC34
 	.incbin "data/maps/AquaHideout_B2F/border.bin"
@@ -2107,13 +2160,14 @@ AquaHideout_B2F_MapBorder:: @ 82DCC34
 AquaHideout_B2F_MapBlockdata:: @ 82DCC3C
 	.incbin "data/maps/AquaHideout_B2F/map.bin"
 
+	.align 2
 AquaHideout_B2F_MapAttributes:: @ 82DD29C
 	.4byte 0x22
 	.4byte 0x18
 	.4byte AquaHideout_B2F_MapBorder
 	.4byte AquaHideout_B2F_MapBlockdata
-	.4byte AquaHideout_B2F_Tileset
-	.4byte AquaHideout_B2F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 Underwater_SeafloorCavern_MapBorder:: @ 82DD2B4
 	.incbin "data/maps/Underwater_SeafloorCavern/border.bin"
@@ -2121,13 +2175,14 @@ Underwater_SeafloorCavern_MapBorder:: @ 82DD2B4
 Underwater_SeafloorCavern_MapBlockdata:: @ 82DD2BC
 	.incbin "data/maps/Underwater_SeafloorCavern/map.bin"
 
+	.align 2
 Underwater_SeafloorCavern_MapAttributes:: @ 82DD3B8
 	.4byte 0xe
 	.4byte 0x9
 	.4byte Underwater_SeafloorCavern_MapBorder
 	.4byte Underwater_SeafloorCavern_MapBlockdata
-	.4byte Underwater_SeafloorCavern_Tileset
-	.4byte Underwater_SeafloorCavern_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
 
 SeafloorCavern_Entrance_MapBorder:: @ 82DD3D0
 	.incbin "data/maps/SeafloorCavern_Entrance/border.bin"
@@ -2135,13 +2190,14 @@ SeafloorCavern_Entrance_MapBorder:: @ 82DD3D0
 SeafloorCavern_Entrance_MapBlockdata:: @ 82DD3D8
 	.incbin "data/maps/SeafloorCavern_Entrance/map.bin"
 
+	.align 2
 SeafloorCavern_Entrance_MapAttributes:: @ 82DD6F8
 	.4byte 0x14
 	.4byte 0x14
 	.4byte SeafloorCavern_Entrance_MapBorder
 	.4byte SeafloorCavern_Entrance_MapBlockdata
-	.4byte SeafloorCavern_Entrance_Tileset
-	.4byte SeafloorCavern_Entrance_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 SeafloorCavern_Room1_MapBorder:: @ 82DD710
 	.incbin "data/maps/SeafloorCavern_Room1/border.bin"
@@ -2149,13 +2205,14 @@ SeafloorCavern_Room1_MapBorder:: @ 82DD710
 SeafloorCavern_Room1_MapBlockdata:: @ 82DD718
 	.incbin "data/maps/SeafloorCavern_Room1/map.bin"
 
+	.align 2
 SeafloorCavern_Room1_MapAttributes:: @ 82DDA60
 	.4byte 0x14
 	.4byte 0x15
 	.4byte SeafloorCavern_Room1_MapBorder
 	.4byte SeafloorCavern_Room1_MapBlockdata
-	.4byte SeafloorCavern_Room1_Tileset
-	.4byte SeafloorCavern_Room1_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 SeafloorCavern_Room2_MapBorder:: @ 82DDA78
 	.incbin "data/maps/SeafloorCavern_Room2/border.bin"
@@ -2163,13 +2220,14 @@ SeafloorCavern_Room2_MapBorder:: @ 82DDA78
 SeafloorCavern_Room2_MapBlockdata:: @ 82DDA80
 	.incbin "data/maps/SeafloorCavern_Room2/map.bin"
 
+	.align 2
 SeafloorCavern_Room2_MapAttributes:: @ 82DDD74
 	.4byte 0x12
 	.4byte 0x15
 	.4byte SeafloorCavern_Room2_MapBorder
 	.4byte SeafloorCavern_Room2_MapBlockdata
-	.4byte SeafloorCavern_Room2_Tileset
-	.4byte SeafloorCavern_Room2_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 SeafloorCavern_Room3_MapBorder:: @ 82DDD8C
 	.incbin "data/maps/SeafloorCavern_Room3/border.bin"
@@ -2177,13 +2235,14 @@ SeafloorCavern_Room3_MapBorder:: @ 82DDD8C
 SeafloorCavern_Room3_MapBlockdata:: @ 82DDD94
 	.incbin "data/maps/SeafloorCavern_Room3/map.bin"
 
+	.align 2
 SeafloorCavern_Room3_MapAttributes:: @ 82DDFB4
 	.4byte 0x10
 	.4byte 0x11
 	.4byte SeafloorCavern_Room3_MapBorder
 	.4byte SeafloorCavern_Room3_MapBlockdata
-	.4byte SeafloorCavern_Room3_Tileset
-	.4byte SeafloorCavern_Room3_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 SeafloorCavern_Room4_MapBorder:: @ 82DDFCC
 	.incbin "data/maps/SeafloorCavern_Room4/border.bin"
@@ -2191,13 +2250,14 @@ SeafloorCavern_Room4_MapBorder:: @ 82DDFCC
 SeafloorCavern_Room4_MapBlockdata:: @ 82DDFD4
 	.incbin "data/maps/SeafloorCavern_Room4/map.bin"
 
+	.align 2
 SeafloorCavern_Room4_MapAttributes:: @ 82DE280
 	.4byte 0x12
 	.4byte 0x13
 	.4byte SeafloorCavern_Room4_MapBorder
 	.4byte SeafloorCavern_Room4_MapBlockdata
-	.4byte SeafloorCavern_Room4_Tileset
-	.4byte SeafloorCavern_Room4_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 SeafloorCavern_Room5_MapBorder:: @ 82DE298
 	.incbin "data/maps/SeafloorCavern_Room5/border.bin"
@@ -2205,13 +2265,14 @@ SeafloorCavern_Room5_MapBorder:: @ 82DE298
 SeafloorCavern_Room5_MapBlockdata:: @ 82DE2A0
 	.incbin "data/maps/SeafloorCavern_Room5/map.bin"
 
+	.align 2
 SeafloorCavern_Room5_MapAttributes:: @ 82DE5C0
 	.4byte 0x14
 	.4byte 0x14
 	.4byte SeafloorCavern_Room5_MapBorder
 	.4byte SeafloorCavern_Room5_MapBlockdata
-	.4byte SeafloorCavern_Room5_Tileset
-	.4byte SeafloorCavern_Room5_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 SeafloorCavern_Room6_MapBorder:: @ 82DE5D8
 	.incbin "data/maps/SeafloorCavern_Room6/border.bin"
@@ -2219,13 +2280,14 @@ SeafloorCavern_Room6_MapBorder:: @ 82DE5D8
 SeafloorCavern_Room6_MapBlockdata:: @ 82DE5E0
 	.incbin "data/maps/SeafloorCavern_Room6/map.bin"
 
+	.align 2
 SeafloorCavern_Room6_MapAttributes:: @ 82DEA30
 	.4byte 0x18
 	.4byte 0x17
 	.4byte SeafloorCavern_Room6_MapBorder
 	.4byte SeafloorCavern_Room6_MapBlockdata
-	.4byte SeafloorCavern_Room6_Tileset
-	.4byte SeafloorCavern_Room6_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
 SeafloorCavern_Room7_MapBorder:: @ 82DEA48
 	.incbin "data/maps/SeafloorCavern_Room7/border.bin"
@@ -2233,15 +2295,14 @@ SeafloorCavern_Room7_MapBorder:: @ 82DEA48
 SeafloorCavern_Room7_MapBlockdata:: @ 82DEA50
 	.incbin "data/maps/SeafloorCavern_Room7/map.bin"
 
-	.incbin "baserom.gba", 0x2deece, 0x2
-
+	.align 2
 SeafloorCavern_Room7_MapAttributes:: @ 82DEED0
 	.4byte 0x17
 	.4byte 0x19
 	.4byte SeafloorCavern_Room7_MapBorder
 	.4byte SeafloorCavern_Room7_MapBlockdata
-	.4byte SeafloorCavern_Room7_Tileset
-	.4byte SeafloorCavern_Room7_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
 SeafloorCavern_Room8_MapBorder:: @ 82DEEE8
 	.incbin "data/maps/SeafloorCavern_Room8/border.bin"
@@ -2249,13 +2310,14 @@ SeafloorCavern_Room8_MapBorder:: @ 82DEEE8
 SeafloorCavern_Room8_MapBlockdata:: @ 82DEEF0
 	.incbin "data/maps/SeafloorCavern_Room8/map.bin"
 
+	.align 2
 SeafloorCavern_Room8_MapAttributes:: @ 82DF024
 	.4byte 0xb
 	.4byte 0xe
 	.4byte SeafloorCavern_Room8_MapBorder
 	.4byte SeafloorCavern_Room8_MapBlockdata
-	.4byte SeafloorCavern_Room8_Tileset
-	.4byte SeafloorCavern_Room8_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 SeafloorCavern_Room9_MapBorder:: @ 82DF03C
 	.incbin "data/maps/SeafloorCavern_Room9/border.bin"
@@ -2263,13 +2325,14 @@ SeafloorCavern_Room9_MapBorder:: @ 82DF03C
 SeafloorCavern_Room9_MapBlockdata:: @ 82DF044
 	.incbin "data/maps/SeafloorCavern_Room9/map.bin"
 
+	.align 2
 SeafloorCavern_Room9_MapAttributes:: @ 82DF9F8
 	.4byte 0x1b
 	.4byte 0x2e
 	.4byte SeafloorCavern_Room9_MapBorder
 	.4byte SeafloorCavern_Room9_MapBlockdata
-	.4byte SeafloorCavern_Room9_Tileset
-	.4byte SeafloorCavern_Room9_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 CaveOfOrigin_Entrance_MapBorder:: @ 82DFA10
 	.incbin "data/maps/CaveOfOrigin_Entrance/border.bin"
@@ -2277,13 +2340,14 @@ CaveOfOrigin_Entrance_MapBorder:: @ 82DFA10
 CaveOfOrigin_Entrance_MapBlockdata:: @ 82DFA18
 	.incbin "data/maps/CaveOfOrigin_Entrance/map.bin"
 
+	.align 2
 CaveOfOrigin_Entrance_MapAttributes:: @ 82DFDF4
 	.4byte 0x13
 	.4byte 0x1a
 	.4byte CaveOfOrigin_Entrance_MapBorder
 	.4byte CaveOfOrigin_Entrance_MapBlockdata
-	.4byte CaveOfOrigin_Entrance_Tileset
-	.4byte CaveOfOrigin_Entrance_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 CaveOfOrigin_1F_MapBorder:: @ 82DFE0C
 	.incbin "data/maps/CaveOfOrigin_1F/border.bin"
@@ -2291,15 +2355,14 @@ CaveOfOrigin_1F_MapBorder:: @ 82DFE0C
 CaveOfOrigin_1F_MapBlockdata:: @ 82DFE14
 	.incbin "data/maps/CaveOfOrigin_1F/map.bin"
 
-	.incbin "baserom.gba", 0x2e0236, 0x2
-
+	.align 2
 CaveOfOrigin_1F_MapAttributes:: @ 82E0238
 	.4byte 0x17
 	.4byte 0x17
 	.4byte CaveOfOrigin_1F_MapBorder
 	.4byte CaveOfOrigin_1F_MapBlockdata
-	.4byte CaveOfOrigin_1F_Tileset
-	.4byte CaveOfOrigin_1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 CaveOfOrigin_B1F_MapBorder:: @ 82E0250
 	.incbin "data/maps/CaveOfOrigin_B1F/border.bin"
@@ -2307,15 +2370,14 @@ CaveOfOrigin_B1F_MapBorder:: @ 82E0250
 CaveOfOrigin_B1F_MapBlockdata:: @ 82E0258
 	.incbin "data/maps/CaveOfOrigin_B1F/map.bin"
 
-	.incbin "baserom.gba", 0x2e067a, 0x2
-
+	.align 2
 CaveOfOrigin_B1F_MapAttributes:: @ 82E067C
 	.4byte 0x17
 	.4byte 0x17
 	.4byte CaveOfOrigin_B1F_MapBorder
 	.4byte CaveOfOrigin_B1F_MapBlockdata
-	.4byte CaveOfOrigin_B1F_Tileset
-	.4byte CaveOfOrigin_B1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 CaveOfOrigin_B2F_MapBorder:: @ 82E0694
 	.incbin "data/maps/CaveOfOrigin_B2F/border.bin"
@@ -2323,15 +2385,14 @@ CaveOfOrigin_B2F_MapBorder:: @ 82E0694
 CaveOfOrigin_B2F_MapBlockdata:: @ 82E069C
 	.incbin "data/maps/CaveOfOrigin_B2F/map.bin"
 
-	.incbin "baserom.gba", 0x2e0a0e, 0x2
-
+	.align 2
 CaveOfOrigin_B2F_MapAttributes:: @ 82E0A10
 	.4byte 0x15
 	.4byte 0x15
 	.4byte CaveOfOrigin_B2F_MapBorder
 	.4byte CaveOfOrigin_B2F_MapBlockdata
-	.4byte CaveOfOrigin_B2F_Tileset
-	.4byte CaveOfOrigin_B2F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 CaveOfOrigin_B3F_MapBorder:: @ 82E0A28
 	.incbin "data/maps/CaveOfOrigin_B3F/border.bin"
@@ -2339,15 +2400,14 @@ CaveOfOrigin_B3F_MapBorder:: @ 82E0A28
 CaveOfOrigin_B3F_MapBlockdata:: @ 82E0A30
 	.incbin "data/maps/CaveOfOrigin_B3F/map.bin"
 
-	.incbin "baserom.gba", 0x2e0d4e, 0x2
-
+	.align 2
 CaveOfOrigin_B3F_MapAttributes:: @ 82E0D50
 	.4byte 0x13
 	.4byte 0x15
 	.4byte CaveOfOrigin_B3F_MapBorder
 	.4byte CaveOfOrigin_B3F_MapBlockdata
-	.4byte CaveOfOrigin_B3F_Tileset
-	.4byte CaveOfOrigin_B3F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 CaveOfOrigin_B4F_MapBorder:: @ 82E0D68
 	.incbin "data/maps/CaveOfOrigin_B4F/border.bin"
@@ -2355,15 +2415,14 @@ CaveOfOrigin_B4F_MapBorder:: @ 82E0D68
 CaveOfOrigin_B4F_MapBlockdata:: @ 82E0D70
 	.incbin "data/maps/CaveOfOrigin_B4F/map.bin"
 
-	.incbin "baserom.gba", 0x2e1042, 0x2
-
+	.align 2
 CaveOfOrigin_B4F_MapAttributes:: @ 82E1044
 	.4byte 0x13
 	.4byte 0x13
 	.4byte CaveOfOrigin_B4F_MapBorder
 	.4byte CaveOfOrigin_B4F_MapBlockdata
-	.4byte CaveOfOrigin_B4F_Tileset
-	.4byte CaveOfOrigin_B4F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 VictoryRoad_1F_MapBorder:: @ 82E105C
 	.incbin "data/maps/VictoryRoad_1F/border.bin"
@@ -2371,13 +2430,14 @@ VictoryRoad_1F_MapBorder:: @ 82E105C
 VictoryRoad_1F_MapBlockdata:: @ 82E1064
 	.incbin "data/maps/VictoryRoad_1F/map.bin"
 
+	.align 2
 VictoryRoad_1F_MapAttributes:: @ 82E2090
 	.4byte 0x2e
 	.4byte 0x2d
 	.4byte VictoryRoad_1F_MapBorder
 	.4byte VictoryRoad_1F_MapBlockdata
-	.4byte VictoryRoad_1F_Tileset
-	.4byte VictoryRoad_1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 ShoalCave_LowTideEntranceRoom_MapBorder:: @ 82E20A8
 	.incbin "data/maps/ShoalCave_LowTideEntranceRoom/border.bin"
@@ -2385,15 +2445,14 @@ ShoalCave_LowTideEntranceRoom_MapBorder:: @ 82E20A8
 ShoalCave_LowTideEntranceRoom_MapBlockdata:: @ 82E20B0
 	.incbin "data/maps/ShoalCave_LowTideEntranceRoom/map.bin"
 
-	.incbin "baserom.gba", 0x2e2a42, 0x2
-
+	.align 2
 ShoalCave_LowTideEntranceRoom_MapAttributes:: @ 82E2A44
 	.4byte 0x23
 	.4byte 0x23
 	.4byte ShoalCave_LowTideEntranceRoom_MapBorder
 	.4byte ShoalCave_LowTideEntranceRoom_MapBlockdata
-	.4byte ShoalCave_LowTideEntranceRoom_Tileset
-	.4byte ShoalCave_LowTideEntranceRoom_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 ShoalCave_LowTideInnerRoom_MapBorder:: @ 82E2A5C
 	.incbin "data/maps/ShoalCave_LowTideInnerRoom/border.bin"
@@ -2401,13 +2460,14 @@ ShoalCave_LowTideInnerRoom_MapBorder:: @ 82E2A5C
 ShoalCave_LowTideInnerRoom_MapBlockdata:: @ 82E2A64
 	.incbin "data/maps/ShoalCave_LowTideInnerRoom/map.bin"
 
+	.align 2
 ShoalCave_LowTideInnerRoom_MapAttributes:: @ 82E380C
 	.4byte 0x2e
 	.4byte 0x26
 	.4byte ShoalCave_LowTideInnerRoom_MapBorder
 	.4byte ShoalCave_LowTideInnerRoom_MapBlockdata
-	.4byte ShoalCave_LowTideInnerRoom_Tileset
-	.4byte ShoalCave_LowTideInnerRoom_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 ShoalCave_LowTideStairsRoom_MapBorder:: @ 82E3824
 	.incbin "data/maps/ShoalCave_LowTideStairsRoom/border.bin"
@@ -2415,15 +2475,14 @@ ShoalCave_LowTideStairsRoom_MapBorder:: @ 82E3824
 ShoalCave_LowTideStairsRoom_MapBlockdata:: @ 82E382C
 	.incbin "data/maps/ShoalCave_LowTideStairsRoom/map.bin"
 
-	.incbin "baserom.gba", 0x2e3aa2, 0x2
-
+	.align 2
 ShoalCave_LowTideStairsRoom_MapAttributes:: @ 82E3AA4
 	.4byte 0x15
 	.4byte 0xf
 	.4byte ShoalCave_LowTideStairsRoom_MapBorder
 	.4byte ShoalCave_LowTideStairsRoom_MapBlockdata
-	.4byte ShoalCave_LowTideStairsRoom_Tileset
-	.4byte ShoalCave_LowTideStairsRoom_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 ShoalCave_LowTideLowerRoom_MapBorder:: @ 82E3ABC
 	.incbin "data/maps/ShoalCave_LowTideLowerRoom/border.bin"
@@ -2431,13 +2490,14 @@ ShoalCave_LowTideLowerRoom_MapBorder:: @ 82E3ABC
 ShoalCave_LowTideLowerRoom_MapBlockdata:: @ 82E3AC4
 	.incbin "data/maps/ShoalCave_LowTideLowerRoom/map.bin"
 
+	.align 2
 ShoalCave_LowTideLowerRoom_MapAttributes:: @ 82E3E28
 	.4byte 0x1f
 	.4byte 0xe
 	.4byte ShoalCave_LowTideLowerRoom_MapBorder
 	.4byte ShoalCave_LowTideLowerRoom_MapBlockdata
-	.4byte ShoalCave_LowTideLowerRoom_Tileset
-	.4byte ShoalCave_LowTideLowerRoom_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 ShoalCave_HighTideEntranceRoom_MapBorder:: @ 82E3E40
 	.incbin "data/maps/ShoalCave_HighTideEntranceRoom/border.bin"
@@ -2445,15 +2505,14 @@ ShoalCave_HighTideEntranceRoom_MapBorder:: @ 82E3E40
 ShoalCave_HighTideEntranceRoom_MapBlockdata:: @ 82E3E48
 	.incbin "data/maps/ShoalCave_HighTideEntranceRoom/map.bin"
 
-	.incbin "baserom.gba", 0x2e47da, 0x2
-
+	.align 2
 ShoalCave_HighTideEntranceRoom_MapAttributes:: @ 82E47DC
 	.4byte 0x23
 	.4byte 0x23
 	.4byte ShoalCave_HighTideEntranceRoom_MapBorder
 	.4byte ShoalCave_HighTideEntranceRoom_MapBlockdata
-	.4byte ShoalCave_HighTideEntranceRoom_Tileset
-	.4byte ShoalCave_HighTideEntranceRoom_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 ShoalCave_HighTideInnerRoom_MapBorder:: @ 82E47F4
 	.incbin "data/maps/ShoalCave_HighTideInnerRoom/border.bin"
@@ -2461,13 +2520,14 @@ ShoalCave_HighTideInnerRoom_MapBorder:: @ 82E47F4
 ShoalCave_HighTideInnerRoom_MapBlockdata:: @ 82E47FC
 	.incbin "data/maps/ShoalCave_HighTideInnerRoom/map.bin"
 
+	.align 2
 ShoalCave_HighTideInnerRoom_MapAttributes:: @ 82E55A4
 	.4byte 0x2e
 	.4byte 0x26
 	.4byte ShoalCave_HighTideInnerRoom_MapBorder
 	.4byte ShoalCave_HighTideInnerRoom_MapBlockdata
-	.4byte ShoalCave_HighTideInnerRoom_Tileset
-	.4byte ShoalCave_HighTideInnerRoom_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 	.incbin "baserom.gba", 0x2e55bc, 0x1f8
 
@@ -2477,15 +2537,14 @@ NewMauville_Entrance_MapBorder:: @ 82E57B4
 NewMauville_Entrance_MapBlockdata:: @ 82E57BC
 	.incbin "data/maps/NewMauville_Entrance/map.bin"
 
-	.incbin "baserom.gba", 0x2e585e, 0x2
-
+	.align 2
 NewMauville_Entrance_MapAttributes:: @ 82E5860
 	.4byte 0x9
 	.4byte 0x9
 	.4byte NewMauville_Entrance_MapBorder
 	.4byte NewMauville_Entrance_MapBlockdata
-	.4byte NewMauville_Entrance_Tileset
-	.4byte NewMauville_Entrance_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 NewMauville_Inside_MapBorder:: @ 82E5878
 	.incbin "data/maps/NewMauville_Inside/border.bin"
@@ -2493,15 +2552,14 @@ NewMauville_Inside_MapBorder:: @ 82E5878
 NewMauville_Inside_MapBlockdata:: @ 82E5880
 	.incbin "data/maps/NewMauville_Inside/map.bin"
 
-	.incbin "baserom.gba", 0x2e65a2, 0x2
-
+	.align 2
 NewMauville_Inside_MapAttributes:: @ 82E65A4
 	.4byte 0x29
 	.4byte 0x29
 	.4byte NewMauville_Inside_MapBorder
 	.4byte NewMauville_Inside_MapBlockdata
-	.4byte NewMauville_Inside_Tileset
-	.4byte NewMauville_Inside_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_BikeShop
 
 AbandonedShip_Deck_MapBorder:: @ 82E65BC
 	.incbin "data/maps/AbandonedShip_Deck/border.bin"
@@ -2509,15 +2567,14 @@ AbandonedShip_Deck_MapBorder:: @ 82E65BC
 AbandonedShip_Deck_MapBlockdata:: @ 82E65C4
 	.incbin "data/maps/AbandonedShip_Deck/map.bin"
 
-	.incbin "baserom.gba", 0x2e698a, 0x2
-
+	.align 2
 AbandonedShip_Deck_MapAttributes:: @ 82E698C
 	.4byte 0x17
 	.4byte 0x15
 	.4byte AbandonedShip_Deck_MapBorder
 	.4byte AbandonedShip_Deck_MapBlockdata
-	.4byte AbandonedShip_Deck_Tileset
-	.4byte AbandonedShip_Deck_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 AbandonedShip_Corridors_1F_MapBorder:: @ 82E69A4
 	.incbin "data/maps/AbandonedShip_Corridors_1F/border.bin"
@@ -2525,13 +2582,14 @@ AbandonedShip_Corridors_1F_MapBorder:: @ 82E69A4
 AbandonedShip_Corridors_1F_MapBlockdata:: @ 82E69AC
 	.incbin "data/maps/AbandonedShip_Corridors_1F/map.bin"
 
+	.align 2
 AbandonedShip_Corridors_1F_MapAttributes:: @ 82E6B5C
 	.4byte 0x12
 	.4byte 0xc
 	.4byte AbandonedShip_Corridors_1F_MapBorder
 	.4byte AbandonedShip_Corridors_1F_MapBlockdata
-	.4byte AbandonedShip_Corridors_1F_Tileset
-	.4byte AbandonedShip_Corridors_1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 AbandonedShip_Rooms_1F_MapBorder:: @ 82E6B74
 	.incbin "data/maps/AbandonedShip_Rooms_1F/border.bin"
@@ -2539,13 +2597,14 @@ AbandonedShip_Rooms_1F_MapBorder:: @ 82E6B74
 AbandonedShip_Rooms_1F_MapBlockdata:: @ 82E6B7C
 	.incbin "data/maps/AbandonedShip_Rooms_1F/map.bin"
 
+	.align 2
 AbandonedShip_Rooms_1F_MapAttributes:: @ 82E6DE0
 	.4byte 0x12
 	.4byte 0x11
 	.4byte AbandonedShip_Rooms_1F_MapBorder
 	.4byte AbandonedShip_Rooms_1F_MapBlockdata
-	.4byte AbandonedShip_Rooms_1F_Tileset
-	.4byte AbandonedShip_Rooms_1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 AbandonedShip_Corridors_B1F_MapBorder:: @ 82E6DF8
 	.incbin "data/maps/AbandonedShip_Corridors_B1F/border.bin"
@@ -2553,13 +2612,14 @@ AbandonedShip_Corridors_B1F_MapBorder:: @ 82E6DF8
 AbandonedShip_Corridors_B1F_MapBlockdata:: @ 82E6E00
 	.incbin "data/maps/AbandonedShip_Corridors_B1F/map.bin"
 
+	.align 2
 AbandonedShip_Corridors_B1F_MapAttributes:: @ 82E6F04
 	.4byte 0xd
 	.4byte 0xa
 	.4byte AbandonedShip_Corridors_B1F_MapBorder
 	.4byte AbandonedShip_Corridors_B1F_MapBlockdata
-	.4byte AbandonedShip_Corridors_B1F_Tileset
-	.4byte AbandonedShip_Corridors_B1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 AbandonedShip_Rooms_B1F_MapBorder:: @ 82E6F1C
 	.incbin "data/maps/AbandonedShip_Rooms_B1F/border.bin"
@@ -2567,13 +2627,14 @@ AbandonedShip_Rooms_B1F_MapBorder:: @ 82E6F1C
 AbandonedShip_Rooms_B1F_MapBlockdata:: @ 82E6F24
 	.incbin "data/maps/AbandonedShip_Rooms_B1F/map.bin"
 
+	.align 2
 AbandonedShip_Rooms_B1F_MapAttributes:: @ 82E70D4
 	.4byte 0x1b
 	.4byte 0x8
 	.4byte AbandonedShip_Rooms_B1F_MapBorder
 	.4byte AbandonedShip_Rooms_B1F_MapBlockdata
-	.4byte AbandonedShip_Rooms_B1F_Tileset
-	.4byte AbandonedShip_Rooms_B1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 AbandonedShip_Rooms2_B1F_MapBorder:: @ 82E70EC
 	.incbin "data/maps/AbandonedShip_Rooms2_B1F/border.bin"
@@ -2581,13 +2642,14 @@ AbandonedShip_Rooms2_B1F_MapBorder:: @ 82E70EC
 AbandonedShip_Rooms2_B1F_MapBlockdata:: @ 82E70F4
 	.incbin "data/maps/AbandonedShip_Rooms2_B1F/map.bin"
 
+	.align 2
 AbandonedShip_Rooms2_B1F_MapAttributes:: @ 82E7214
 	.4byte 0x12
 	.4byte 0x8
 	.4byte AbandonedShip_Rooms2_B1F_MapBorder
 	.4byte AbandonedShip_Rooms2_B1F_MapBlockdata
-	.4byte AbandonedShip_Rooms2_B1F_Tileset
-	.4byte AbandonedShip_Rooms2_B1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 AbandonedShip_Underwater1_MapBorder:: @ 82E722C
 	.incbin "data/maps/AbandonedShip_Underwater1/border.bin"
@@ -2595,13 +2657,14 @@ AbandonedShip_Underwater1_MapBorder:: @ 82E722C
 AbandonedShip_Underwater1_MapBlockdata:: @ 82E7234
 	.incbin "data/maps/AbandonedShip_Underwater1/map.bin"
 
+	.align 2
 AbandonedShip_Underwater1_MapAttributes:: @ 82E72B4
 	.4byte 0x8
 	.4byte 0x8
 	.4byte AbandonedShip_Underwater1_MapBorder
 	.4byte AbandonedShip_Underwater1_MapBlockdata
-	.4byte AbandonedShip_Underwater1_Tileset
-	.4byte AbandonedShip_Underwater1_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 AbandonedShip_Room_B1F_MapBorder:: @ 82E72CC
 	.incbin "data/maps/AbandonedShip_Room_B1F/border.bin"
@@ -2609,13 +2672,14 @@ AbandonedShip_Room_B1F_MapBorder:: @ 82E72CC
 AbandonedShip_Room_B1F_MapBlockdata:: @ 82E72D4
 	.incbin "data/maps/AbandonedShip_Room_B1F/map.bin"
 
+	.align 2
 AbandonedShip_Room_B1F_MapAttributes:: @ 82E7364
 	.4byte 0x9
 	.4byte 0x8
 	.4byte AbandonedShip_Room_B1F_MapBorder
 	.4byte AbandonedShip_Room_B1F_MapBlockdata
-	.4byte AbandonedShip_Room_B1F_Tileset
-	.4byte AbandonedShip_Room_B1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 AbandonedShip_Rooms2_1F_MapBorder:: @ 82E737C
 	.incbin "data/maps/AbandonedShip_Rooms2_1F/border.bin"
@@ -2623,15 +2687,14 @@ AbandonedShip_Rooms2_1F_MapBorder:: @ 82E737C
 AbandonedShip_Rooms2_1F_MapBlockdata:: @ 82E7384
 	.incbin "data/maps/AbandonedShip_Rooms2_1F/map.bin"
 
-	.incbin "baserom.gba", 0x2e74b6, 0x2
-
+	.align 2
 AbandonedShip_Rooms2_1F_MapAttributes:: @ 82E74B8
 	.4byte 0x9
 	.4byte 0x11
 	.4byte AbandonedShip_Rooms2_1F_MapBorder
 	.4byte AbandonedShip_Rooms2_1F_MapBlockdata
-	.4byte AbandonedShip_Rooms2_1F_Tileset
-	.4byte AbandonedShip_Rooms2_1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 AbandonedShip_CaptainsOffice_MapBorder:: @ 82E74D0
 	.incbin "data/maps/AbandonedShip_CaptainsOffice/border.bin"
@@ -2639,15 +2702,14 @@ AbandonedShip_CaptainsOffice_MapBorder:: @ 82E74D0
 AbandonedShip_CaptainsOffice_MapBlockdata:: @ 82E74D8
 	.incbin "data/maps/AbandonedShip_CaptainsOffice/map.bin"
 
-	.incbin "baserom.gba", 0x2e7556, 0x2
-
+	.align 2
 AbandonedShip_CaptainsOffice_MapAttributes:: @ 82E7558
 	.4byte 0x9
 	.4byte 0x7
 	.4byte AbandonedShip_CaptainsOffice_MapBorder
 	.4byte AbandonedShip_CaptainsOffice_MapBlockdata
-	.4byte AbandonedShip_CaptainsOffice_Tileset
-	.4byte AbandonedShip_CaptainsOffice_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 AbandonedShip_Underwater2_MapBorder:: @ 82E7570
 	.incbin "data/maps/AbandonedShip_Underwater2/border.bin"
@@ -2655,15 +2717,14 @@ AbandonedShip_Underwater2_MapBorder:: @ 82E7570
 AbandonedShip_Underwater2_MapBlockdata:: @ 82E7578
 	.incbin "data/maps/AbandonedShip_Underwater2/map.bin"
 
-	.incbin "baserom.gba", 0x2e769e, 0x2
-
+	.align 2
 AbandonedShip_Underwater2_MapAttributes:: @ 82E76A0
 	.4byte 0x15
 	.4byte 0x7
 	.4byte AbandonedShip_Underwater2_MapBorder
 	.4byte AbandonedShip_Underwater2_MapBlockdata
-	.4byte AbandonedShip_Underwater2_Tileset
-	.4byte AbandonedShip_Underwater2_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 SecretBase_RedCave1_MapBorder:: @ 82E76B8
 	.incbin "data/maps/SecretBase_RedCave1/border.bin"
@@ -2671,15 +2732,14 @@ SecretBase_RedCave1_MapBorder:: @ 82E76B8
 SecretBase_RedCave1_MapBlockdata:: @ 82E76C0
 	.incbin "data/maps/SecretBase_RedCave1/map.bin"
 
-	.incbin "baserom.gba", 0x2e7786, 0x2
-
+	.align 2
 SecretBase_RedCave1_MapAttributes:: @ 82E7788
 	.4byte 0xb
 	.4byte 0x9
 	.4byte SecretBase_RedCave1_MapBorder
 	.4byte SecretBase_RedCave1_MapBlockdata
-	.4byte SecretBase_RedCave1_Tileset
-	.4byte SecretBase_RedCave1_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
 
 SecretBase_BrownCave1_MapBorder:: @ 82E77A0
 	.incbin "data/maps/SecretBase_BrownCave1/border.bin"
@@ -2687,15 +2747,14 @@ SecretBase_BrownCave1_MapBorder:: @ 82E77A0
 SecretBase_BrownCave1_MapBlockdata:: @ 82E77A8
 	.incbin "data/maps/SecretBase_BrownCave1/map.bin"
 
-	.incbin "baserom.gba", 0x2e786e, 0x2
-
+	.align 2
 SecretBase_BrownCave1_MapAttributes:: @ 82E7870
 	.4byte 0xb
 	.4byte 0x9
 	.4byte SecretBase_BrownCave1_MapBorder
 	.4byte SecretBase_BrownCave1_MapBlockdata
-	.4byte SecretBase_BrownCave1_Tileset
-	.4byte SecretBase_BrownCave1_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
 
 SecretBase_BlueCave1_MapBorder:: @ 82E7888
 	.incbin "data/maps/SecretBase_BlueCave1/border.bin"
@@ -2703,15 +2762,14 @@ SecretBase_BlueCave1_MapBorder:: @ 82E7888
 SecretBase_BlueCave1_MapBlockdata:: @ 82E7890
 	.incbin "data/maps/SecretBase_BlueCave1/map.bin"
 
-	.incbin "baserom.gba", 0x2e7956, 0x2
-
+	.align 2
 SecretBase_BlueCave1_MapAttributes:: @ 82E7958
 	.4byte 0xb
 	.4byte 0x9
 	.4byte SecretBase_BlueCave1_MapBorder
 	.4byte SecretBase_BlueCave1_MapBlockdata
-	.4byte SecretBase_BlueCave1_Tileset
-	.4byte SecretBase_BlueCave1_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
 
 SecretBase_YellowCave1_MapBorder:: @ 82E7970
 	.incbin "data/maps/SecretBase_YellowCave1/border.bin"
@@ -2719,15 +2777,14 @@ SecretBase_YellowCave1_MapBorder:: @ 82E7970
 SecretBase_YellowCave1_MapBlockdata:: @ 82E7978
 	.incbin "data/maps/SecretBase_YellowCave1/map.bin"
 
-	.incbin "baserom.gba", 0x2e7a3e, 0x2
-
+	.align 2
 SecretBase_YellowCave1_MapAttributes:: @ 82E7A40
 	.4byte 0xb
 	.4byte 0x9
 	.4byte SecretBase_YellowCave1_MapBorder
 	.4byte SecretBase_YellowCave1_MapBlockdata
-	.4byte SecretBase_YellowCave1_Tileset
-	.4byte SecretBase_YellowCave1_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
 
 SecretBase_Tree1_MapBorder:: @ 82E7A58
 	.incbin "data/maps/SecretBase_Tree1/border.bin"
@@ -2735,15 +2792,14 @@ SecretBase_Tree1_MapBorder:: @ 82E7A58
 SecretBase_Tree1_MapBlockdata:: @ 82E7A60
 	.incbin "data/maps/SecretBase_Tree1/map.bin"
 
-	.incbin "baserom.gba", 0x2e7b26, 0x2
-
+	.align 2
 SecretBase_Tree1_MapAttributes:: @ 82E7B28
 	.4byte 0xb
 	.4byte 0x9
 	.4byte SecretBase_Tree1_MapBorder
 	.4byte SecretBase_Tree1_MapBlockdata
-	.4byte SecretBase_Tree1_Tileset
-	.4byte SecretBase_Tree1_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
 
 SecretBase_Shrub1_MapBorder:: @ 82E7B40
 	.incbin "data/maps/SecretBase_Shrub1/border.bin"
@@ -2751,15 +2807,14 @@ SecretBase_Shrub1_MapBorder:: @ 82E7B40
 SecretBase_Shrub1_MapBlockdata:: @ 82E7B48
 	.incbin "data/maps/SecretBase_Shrub1/map.bin"
 
-	.incbin "baserom.gba", 0x2e7c0e, 0x2
-
+	.align 2
 SecretBase_Shrub1_MapAttributes:: @ 82E7C10
 	.4byte 0xb
 	.4byte 0x9
 	.4byte SecretBase_Shrub1_MapBorder
 	.4byte SecretBase_Shrub1_MapBlockdata
-	.4byte SecretBase_Shrub1_Tileset
-	.4byte SecretBase_Shrub1_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
 
 SecretBase_RedCave2_MapBorder:: @ 82E7C28
 	.incbin "data/maps/SecretBase_RedCave2/border.bin"
@@ -2767,13 +2822,14 @@ SecretBase_RedCave2_MapBorder:: @ 82E7C28
 SecretBase_RedCave2_MapBlockdata:: @ 82E7C30
 	.incbin "data/maps/SecretBase_RedCave2/map.bin"
 
+	.align 2
 SecretBase_RedCave2_MapAttributes:: @ 82E7D10
 	.4byte 0x7
 	.4byte 0x10
 	.4byte SecretBase_RedCave2_MapBorder
 	.4byte SecretBase_RedCave2_MapBlockdata
-	.4byte SecretBase_RedCave2_Tileset
-	.4byte SecretBase_RedCave2_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
 
 SecretBase_BrownCave2_MapBorder:: @ 82E7D28
 	.incbin "data/maps/SecretBase_BrownCave2/border.bin"
@@ -2781,13 +2837,14 @@ SecretBase_BrownCave2_MapBorder:: @ 82E7D28
 SecretBase_BrownCave2_MapBlockdata:: @ 82E7D30
 	.incbin "data/maps/SecretBase_BrownCave2/map.bin"
 
+	.align 2
 SecretBase_BrownCave2_MapAttributes:: @ 82E7E2C
 	.4byte 0xe
 	.4byte 0x9
 	.4byte SecretBase_BrownCave2_MapBorder
 	.4byte SecretBase_BrownCave2_MapBlockdata
-	.4byte SecretBase_BrownCave2_Tileset
-	.4byte SecretBase_BrownCave2_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
 
 SecretBase_BlueCave2_MapBorder:: @ 82E7E44
 	.incbin "data/maps/SecretBase_BlueCave2/border.bin"
@@ -2795,15 +2852,14 @@ SecretBase_BlueCave2_MapBorder:: @ 82E7E44
 SecretBase_BlueCave2_MapBlockdata:: @ 82E7E4C
 	.incbin "data/maps/SecretBase_BlueCave2/map.bin"
 
-	.incbin "baserom.gba", 0x2e7f1e, 0x2
-
+	.align 2
 SecretBase_BlueCave2_MapAttributes:: @ 82E7F20
 	.4byte 0xf
 	.4byte 0x7
 	.4byte SecretBase_BlueCave2_MapBorder
 	.4byte SecretBase_BlueCave2_MapBlockdata
-	.4byte SecretBase_BlueCave2_Tileset
-	.4byte SecretBase_BlueCave2_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
 
 SecretBase_YellowCave2_MapBorder:: @ 82E7F38
 	.incbin "data/maps/SecretBase_YellowCave2/border.bin"
@@ -2811,13 +2867,14 @@ SecretBase_YellowCave2_MapBorder:: @ 82E7F38
 SecretBase_YellowCave2_MapBlockdata:: @ 82E7F40
 	.incbin "data/maps/SecretBase_YellowCave2/map.bin"
 
+	.align 2
 SecretBase_YellowCave2_MapAttributes:: @ 82E803C
 	.4byte 0xe
 	.4byte 0x9
 	.4byte SecretBase_YellowCave2_MapBorder
 	.4byte SecretBase_YellowCave2_MapBlockdata
-	.4byte SecretBase_YellowCave2_Tileset
-	.4byte SecretBase_YellowCave2_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
 
 SecretBase_Tree2_MapBorder:: @ 82E8054
 	.incbin "data/maps/SecretBase_Tree2/border.bin"
@@ -2825,13 +2882,14 @@ SecretBase_Tree2_MapBorder:: @ 82E8054
 SecretBase_Tree2_MapBlockdata:: @ 82E805C
 	.incbin "data/maps/SecretBase_Tree2/map.bin"
 
+	.align 2
 SecretBase_Tree2_MapAttributes:: @ 82E813C
 	.4byte 0x7
 	.4byte 0x10
 	.4byte SecretBase_Tree2_MapBorder
 	.4byte SecretBase_Tree2_MapBlockdata
-	.4byte SecretBase_Tree2_Tileset
-	.4byte SecretBase_Tree2_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
 
 SecretBase_Shrub2_MapBorder:: @ 82E8154
 	.incbin "data/maps/SecretBase_Shrub2/border.bin"
@@ -2839,15 +2897,14 @@ SecretBase_Shrub2_MapBorder:: @ 82E8154
 SecretBase_Shrub2_MapBlockdata:: @ 82E815C
 	.incbin "data/maps/SecretBase_Shrub2/map.bin"
 
-	.incbin "baserom.gba", 0x2e822e, 0x2
-
+	.align 2
 SecretBase_Shrub2_MapAttributes:: @ 82E8230
 	.4byte 0xf
 	.4byte 0x7
 	.4byte SecretBase_Shrub2_MapBorder
 	.4byte SecretBase_Shrub2_MapBlockdata
-	.4byte SecretBase_Shrub2_Tileset
-	.4byte SecretBase_Shrub2_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
 
 SecretBase_RedCave3_MapBorder:: @ 82E8248
 	.incbin "data/maps/SecretBase_RedCave3/border.bin"
@@ -2855,13 +2912,14 @@ SecretBase_RedCave3_MapBorder:: @ 82E8248
 SecretBase_RedCave3_MapBlockdata:: @ 82E8250
 	.incbin "data/maps/SecretBase_RedCave3/map.bin"
 
+	.align 2
 SecretBase_RedCave3_MapAttributes:: @ 82E8340
 	.4byte 0xf
 	.4byte 0x8
 	.4byte SecretBase_RedCave3_MapBorder
 	.4byte SecretBase_RedCave3_MapBlockdata
-	.4byte SecretBase_RedCave3_Tileset
-	.4byte SecretBase_RedCave3_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
 
 SecretBase_BrownCave3_MapBorder:: @ 82E8358
 	.incbin "data/maps/SecretBase_BrownCave3/border.bin"
@@ -2869,15 +2927,14 @@ SecretBase_BrownCave3_MapBorder:: @ 82E8358
 SecretBase_BrownCave3_MapBlockdata:: @ 82E8360
 	.incbin "data/maps/SecretBase_BrownCave3/map.bin"
 
-	.incbin "baserom.gba", 0x2e84aa, 0x2
-
+	.align 2
 SecretBase_BrownCave3_MapAttributes:: @ 82E84AC
 	.4byte 0xf
 	.4byte 0xb
 	.4byte SecretBase_BrownCave3_MapBorder
 	.4byte SecretBase_BrownCave3_MapBlockdata
-	.4byte SecretBase_BrownCave3_Tileset
-	.4byte SecretBase_BrownCave3_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
 
 SecretBase_BlueCave3_MapBorder:: @ 82E84C4
 	.incbin "data/maps/SecretBase_BlueCave3/border.bin"
@@ -2885,13 +2942,14 @@ SecretBase_BlueCave3_MapBorder:: @ 82E84C4
 SecretBase_BlueCave3_MapBlockdata:: @ 82E84CC
 	.incbin "data/maps/SecretBase_BlueCave3/map.bin"
 
+	.align 2
 SecretBase_BlueCave3_MapAttributes:: @ 82E8620
 	.4byte 0xa
 	.4byte 0x11
 	.4byte SecretBase_BlueCave3_MapBorder
 	.4byte SecretBase_BlueCave3_MapBlockdata
-	.4byte SecretBase_BlueCave3_Tileset
-	.4byte SecretBase_BlueCave3_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
 
 SecretBase_YellowCave3_MapBorder:: @ 82E8638
 	.incbin "data/maps/SecretBase_YellowCave3/border.bin"
@@ -2899,13 +2957,14 @@ SecretBase_YellowCave3_MapBorder:: @ 82E8638
 SecretBase_YellowCave3_MapBlockdata:: @ 82E8640
 	.incbin "data/maps/SecretBase_YellowCave3/map.bin"
 
+	.align 2
 SecretBase_YellowCave3_MapAttributes:: @ 82E8748
 	.4byte 0xc
 	.4byte 0xb
 	.4byte SecretBase_YellowCave3_MapBorder
 	.4byte SecretBase_YellowCave3_MapBlockdata
-	.4byte SecretBase_YellowCave3_Tileset
-	.4byte SecretBase_YellowCave3_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
 
 SecretBase_Tree3_MapBorder:: @ 82E8760
 	.incbin "data/maps/SecretBase_Tree3/border.bin"
@@ -2913,13 +2972,14 @@ SecretBase_Tree3_MapBorder:: @ 82E8760
 SecretBase_Tree3_MapBlockdata:: @ 82E8768
 	.incbin "data/maps/SecretBase_Tree3/map.bin"
 
+	.align 2
 SecretBase_Tree3_MapAttributes:: @ 82E8878
 	.4byte 0x11
 	.4byte 0x8
 	.4byte SecretBase_Tree3_MapBorder
 	.4byte SecretBase_Tree3_MapBlockdata
-	.4byte SecretBase_Tree3_Tileset
-	.4byte SecretBase_Tree3_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
 
 SecretBase_Shrub3_MapBorder:: @ 82E8890
 	.incbin "data/maps/SecretBase_Shrub3/border.bin"
@@ -2927,15 +2987,14 @@ SecretBase_Shrub3_MapBorder:: @ 82E8890
 SecretBase_Shrub3_MapBlockdata:: @ 82E8898
 	.incbin "data/maps/SecretBase_Shrub3/map.bin"
 
-	.incbin "baserom.gba", 0x2e89b6, 0x2
-
+	.align 2
 SecretBase_Shrub3_MapAttributes:: @ 82E89B8
 	.4byte 0xd
 	.4byte 0xb
 	.4byte SecretBase_Shrub3_MapBorder
 	.4byte SecretBase_Shrub3_MapBlockdata
-	.4byte SecretBase_Shrub3_Tileset
-	.4byte SecretBase_Shrub3_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
 
 SecretBase_RedCave4_MapBorder:: @ 82E89D0
 	.incbin "data/maps/SecretBase_RedCave4/border.bin"
@@ -2943,15 +3002,14 @@ SecretBase_RedCave4_MapBorder:: @ 82E89D0
 SecretBase_RedCave4_MapBlockdata:: @ 82E89D8
 	.incbin "data/maps/SecretBase_RedCave4/map.bin"
 
-	.incbin "baserom.gba", 0x2e8ae6, 0x2
-
+	.align 2
 SecretBase_RedCave4_MapAttributes:: @ 82E8AE8
 	.4byte 0x9
 	.4byte 0xf
 	.4byte SecretBase_RedCave4_MapBorder
 	.4byte SecretBase_RedCave4_MapBlockdata
-	.4byte SecretBase_RedCave4_Tileset
-	.4byte SecretBase_RedCave4_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
 
 SecretBase_BrownCave4_MapBorder:: @ 82E8B00
 	.incbin "data/maps/SecretBase_BrownCave4/border.bin"
@@ -2959,13 +3017,14 @@ SecretBase_BrownCave4_MapBorder:: @ 82E8B00
 SecretBase_BrownCave4_MapBlockdata:: @ 82E8B08
 	.incbin "data/maps/SecretBase_BrownCave4/map.bin"
 
+	.align 2
 SecretBase_BrownCave4_MapAttributes:: @ 82E8C58
 	.4byte 0xe
 	.4byte 0xc
 	.4byte SecretBase_BrownCave4_MapBorder
 	.4byte SecretBase_BrownCave4_MapBlockdata
-	.4byte SecretBase_BrownCave4_Tileset
-	.4byte SecretBase_BrownCave4_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
 
 SecretBase_BlueCave4_MapBorder:: @ 82E8C70
 	.incbin "data/maps/SecretBase_BlueCave4/border.bin"
@@ -2973,15 +3032,14 @@ SecretBase_BlueCave4_MapBorder:: @ 82E8C70
 SecretBase_BlueCave4_MapBlockdata:: @ 82E8C78
 	.incbin "data/maps/SecretBase_BlueCave4/map.bin"
 
-	.incbin "baserom.gba", 0x2e8daa, 0x2
-
+	.align 2
 SecretBase_BlueCave4_MapAttributes:: @ 82E8DAC
 	.4byte 0x9
 	.4byte 0x11
 	.4byte SecretBase_BlueCave4_MapBorder
 	.4byte SecretBase_BlueCave4_MapBlockdata
-	.4byte SecretBase_BlueCave4_Tileset
-	.4byte SecretBase_BlueCave4_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
 
 SecretBase_YellowCave4_MapBorder:: @ 82E8DC4
 	.incbin "data/maps/SecretBase_YellowCave4/border.bin"
@@ -2989,13 +3047,14 @@ SecretBase_YellowCave4_MapBorder:: @ 82E8DC4
 SecretBase_YellowCave4_MapBlockdata:: @ 82E8DCC
 	.incbin "data/maps/SecretBase_YellowCave4/map.bin"
 
+	.align 2
 SecretBase_YellowCave4_MapAttributes:: @ 82E8F38
 	.4byte 0xd
 	.4byte 0xe
 	.4byte SecretBase_YellowCave4_MapBorder
 	.4byte SecretBase_YellowCave4_MapBlockdata
-	.4byte SecretBase_YellowCave4_Tileset
-	.4byte SecretBase_YellowCave4_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
 
 SecretBase_Tree4_MapBorder:: @ 82E8F50
 	.incbin "data/maps/SecretBase_Tree4/border.bin"
@@ -3003,13 +3062,14 @@ SecretBase_Tree4_MapBorder:: @ 82E8F50
 SecretBase_Tree4_MapBlockdata:: @ 82E8F58
 	.incbin "data/maps/SecretBase_Tree4/map.bin"
 
+	.align 2
 SecretBase_Tree4_MapAttributes:: @ 82E90E0
 	.4byte 0xe
 	.4byte 0xe
 	.4byte SecretBase_Tree4_MapBorder
 	.4byte SecretBase_Tree4_MapBlockdata
-	.4byte SecretBase_Tree4_Tileset
-	.4byte SecretBase_Tree4_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
 
 SecretBase_Shrub4_MapBorder:: @ 82E90F8
 	.incbin "data/maps/SecretBase_Shrub4/border.bin"
@@ -3017,13 +3077,14 @@ SecretBase_Shrub4_MapBorder:: @ 82E90F8
 SecretBase_Shrub4_MapBlockdata:: @ 82E9100
 	.incbin "data/maps/SecretBase_Shrub4/map.bin"
 
+	.align 2
 SecretBase_Shrub4_MapAttributes:: @ 82E9234
 	.4byte 0xe
 	.4byte 0xb
 	.4byte SecretBase_Shrub4_MapBorder
 	.4byte SecretBase_Shrub4_MapBlockdata
-	.4byte SecretBase_Shrub4_Tileset
-	.4byte SecretBase_Shrub4_Tileset2
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
 
 SingleBattleColosseum_MapBorder:: @ 82E924C
 	.incbin "data/maps/SingleBattleColosseum/border.bin"
@@ -3031,13 +3092,14 @@ SingleBattleColosseum_MapBorder:: @ 82E924C
 SingleBattleColosseum_MapBlockdata:: @ 82E9254
 	.incbin "data/maps/SingleBattleColosseum/map.bin"
 
+	.align 2
 SingleBattleColosseum_MapAttributes:: @ 82E9350
 	.4byte 0xe
 	.4byte 0x9
 	.4byte SingleBattleColosseum_MapBorder
 	.4byte SingleBattleColosseum_MapBlockdata
-	.4byte SingleBattleColosseum_Tileset
-	.4byte SingleBattleColosseum_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
 
 TradeCenter_MapBorder:: @ 82E9368
 	.incbin "data/maps/TradeCenter/border.bin"
@@ -3045,13 +3107,14 @@ TradeCenter_MapBorder:: @ 82E9368
 TradeCenter_MapBlockdata:: @ 82E9370
 	.incbin "data/maps/TradeCenter/map.bin"
 
+	.align 2
 TradeCenter_MapAttributes:: @ 82E9448
 	.4byte 0xc
 	.4byte 0x9
 	.4byte TradeCenter_MapBorder
 	.4byte TradeCenter_MapBlockdata
-	.4byte TradeCenter_Tileset
-	.4byte TradeCenter_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
 
 RecordCorner_MapBorder:: @ 82E9460
 	.incbin "data/maps/RecordCorner/border.bin"
@@ -3059,13 +3122,14 @@ RecordCorner_MapBorder:: @ 82E9460
 RecordCorner_MapBlockdata:: @ 82E9468
 	.incbin "data/maps/RecordCorner/map.bin"
 
+	.align 2
 RecordCorner_MapAttributes:: @ 82E95F8
 	.4byte 0x14
 	.4byte 0xa
 	.4byte RecordCorner_MapBorder
 	.4byte RecordCorner_MapBlockdata
-	.4byte RecordCorner_Tileset
-	.4byte RecordCorner_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
 
 DoubleBattleColosseum_MapBorder:: @ 82E9610
 	.incbin "data/maps/DoubleBattleColosseum/border.bin"
@@ -3073,13 +3137,14 @@ DoubleBattleColosseum_MapBorder:: @ 82E9610
 DoubleBattleColosseum_MapBlockdata:: @ 82E9618
 	.incbin "data/maps/DoubleBattleColosseum/map.bin"
 
+	.align 2
 DoubleBattleColosseum_MapAttributes:: @ 82E9714
 	.4byte 0xe
 	.4byte 0x9
 	.4byte DoubleBattleColosseum_MapBorder
 	.4byte DoubleBattleColosseum_MapBlockdata
-	.4byte DoubleBattleColosseum_Tileset
-	.4byte DoubleBattleColosseum_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
 
 LinkContestRoom1_MapBorder:: @ 82E972C
 	.incbin "data/maps/LinkContestRoom1/border.bin"
@@ -3087,15 +3152,14 @@ LinkContestRoom1_MapBorder:: @ 82E972C
 LinkContestRoom1_MapBlockdata:: @ 82E9734
 	.incbin "data/maps/LinkContestRoom1/map.bin"
 
-	.incbin "baserom.gba", 0x2e987e, 0x2
-
+	.align 2
 LinkContestRoom1_MapAttributes:: @ 82E9880
 	.4byte 0xf
 	.4byte 0xb
 	.4byte LinkContestRoom1_MapBorder
 	.4byte LinkContestRoom1_MapBlockdata
-	.4byte LinkContestRoom1_Tileset
-	.4byte LinkContestRoom1_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Contest
 
 UnknownMap_25_29_MapBorder:: @ 82E9898
 	.incbin "data/maps/UnknownMap_25_29/border.bin"
@@ -3103,15 +3167,14 @@ UnknownMap_25_29_MapBorder:: @ 82E9898
 UnknownMap_25_29_MapBlockdata:: @ 82E98A0
 	.incbin "data/maps/UnknownMap_25_29/map.bin"
 
-	.incbin "baserom.gba", 0x2e98a2, 0x2
-
+	.align 2
 UnknownMap_25_29_MapAttributes:: @ 82E98A4
 	.4byte 0x1
 	.4byte 0x1
 	.4byte UnknownMap_25_29_MapBorder
 	.4byte UnknownMap_25_29_MapBlockdata
-	.4byte UnknownMap_25_29_Tileset
-	.4byte UnknownMap_25_29_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
 
 UnknownMap_25_30_MapBorder:: @ 82E98BC
 	.incbin "data/maps/UnknownMap_25_30/border.bin"
@@ -3119,15 +3182,14 @@ UnknownMap_25_30_MapBorder:: @ 82E98BC
 UnknownMap_25_30_MapBlockdata:: @ 82E98C4
 	.incbin "data/maps/UnknownMap_25_30/map.bin"
 
-	.incbin "baserom.gba", 0x2e98c6, 0x2
-
+	.align 2
 UnknownMap_25_30_MapAttributes:: @ 82E98C8
 	.4byte 0x1
 	.4byte 0x1
 	.4byte UnknownMap_25_30_MapBorder
 	.4byte UnknownMap_25_30_MapBlockdata
-	.4byte UnknownMap_25_30_Tileset
-	.4byte UnknownMap_25_30_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
 
 UnknownMap_25_31_MapBorder:: @ 82E98E0
 	.incbin "data/maps/UnknownMap_25_31/border.bin"
@@ -3135,15 +3197,14 @@ UnknownMap_25_31_MapBorder:: @ 82E98E0
 UnknownMap_25_31_MapBlockdata:: @ 82E98E8
 	.incbin "data/maps/UnknownMap_25_31/map.bin"
 
-	.incbin "baserom.gba", 0x2e98ea, 0x2
-
+	.align 2
 UnknownMap_25_31_MapAttributes:: @ 82E98EC
 	.4byte 0x1
 	.4byte 0x1
 	.4byte UnknownMap_25_31_MapBorder
 	.4byte UnknownMap_25_31_MapBlockdata
-	.4byte UnknownMap_25_31_Tileset
-	.4byte UnknownMap_25_31_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
 
 UnknownMap_25_32_MapBorder:: @ 82E9904
 	.incbin "data/maps/UnknownMap_25_32/border.bin"
@@ -3151,15 +3212,14 @@ UnknownMap_25_32_MapBorder:: @ 82E9904
 UnknownMap_25_32_MapBlockdata:: @ 82E990C
 	.incbin "data/maps/UnknownMap_25_32/map.bin"
 
-	.incbin "baserom.gba", 0x2e990e, 0x2
-
+	.align 2
 UnknownMap_25_32_MapAttributes:: @ 82E9910
 	.4byte 0x1
 	.4byte 0x1
 	.4byte UnknownMap_25_32_MapBorder
 	.4byte UnknownMap_25_32_MapBlockdata
-	.4byte UnknownMap_25_32_Tileset
-	.4byte UnknownMap_25_32_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
 
 UnknownMap_25_33_MapBorder:: @ 82E9928
 	.incbin "data/maps/UnknownMap_25_33/border.bin"
@@ -3167,15 +3227,14 @@ UnknownMap_25_33_MapBorder:: @ 82E9928
 UnknownMap_25_33_MapBlockdata:: @ 82E9930
 	.incbin "data/maps/UnknownMap_25_33/map.bin"
 
-	.incbin "baserom.gba", 0x2e9932, 0x2
-
+	.align 2
 UnknownMap_25_33_MapAttributes:: @ 82E9934
 	.4byte 0x1
 	.4byte 0x1
 	.4byte UnknownMap_25_33_MapBorder
 	.4byte UnknownMap_25_33_MapBlockdata
-	.4byte UnknownMap_25_33_Tileset
-	.4byte UnknownMap_25_33_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
 
 UnknownMap_25_34_MapBorder:: @ 82E994C
 	.incbin "data/maps/UnknownMap_25_34/border.bin"
@@ -3183,15 +3242,14 @@ UnknownMap_25_34_MapBorder:: @ 82E994C
 UnknownMap_25_34_MapBlockdata:: @ 82E9954
 	.incbin "data/maps/UnknownMap_25_34/map.bin"
 
-	.incbin "baserom.gba", 0x2e9956, 0x2
-
+	.align 2
 UnknownMap_25_34_MapAttributes:: @ 82E9958
 	.4byte 0x1
 	.4byte 0x1
 	.4byte UnknownMap_25_34_MapBorder
 	.4byte UnknownMap_25_34_MapBlockdata
-	.4byte UnknownMap_25_34_Tileset
-	.4byte UnknownMap_25_34_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
 
 LinkContestRoom2_MapBorder:: @ 82E9970
 	.incbin "data/maps/LinkContestRoom2/border.bin"
@@ -3199,15 +3257,14 @@ LinkContestRoom2_MapBorder:: @ 82E9970
 LinkContestRoom2_MapBlockdata:: @ 82E9978
 	.incbin "data/maps/LinkContestRoom2/map.bin"
 
-	.incbin "baserom.gba", 0x2e9ac2, 0x2
-
+	.align 2
 LinkContestRoom2_MapAttributes:: @ 82E9AC4
 	.4byte 0xf
 	.4byte 0xb
 	.4byte LinkContestRoom2_MapBorder
 	.4byte LinkContestRoom2_MapBlockdata
-	.4byte LinkContestRoom2_Tileset
-	.4byte LinkContestRoom2_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Contest
 
 LinkContestRoom3_MapBorder:: @ 82E9ADC
 	.incbin "data/maps/LinkContestRoom3/border.bin"
@@ -3215,15 +3272,14 @@ LinkContestRoom3_MapBorder:: @ 82E9ADC
 LinkContestRoom3_MapBlockdata:: @ 82E9AE4
 	.incbin "data/maps/LinkContestRoom3/map.bin"
 
-	.incbin "baserom.gba", 0x2e9c2e, 0x2
-
+	.align 2
 LinkContestRoom3_MapAttributes:: @ 82E9C30
 	.4byte 0xf
 	.4byte 0xb
 	.4byte LinkContestRoom3_MapBorder
 	.4byte LinkContestRoom3_MapBlockdata
-	.4byte LinkContestRoom3_Tileset
-	.4byte LinkContestRoom3_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Contest
 
 LinkContestRoom4_MapBorder:: @ 82E9C48
 	.incbin "data/maps/LinkContestRoom4/border.bin"
@@ -3231,15 +3287,14 @@ LinkContestRoom4_MapBorder:: @ 82E9C48
 LinkContestRoom4_MapBlockdata:: @ 82E9C50
 	.incbin "data/maps/LinkContestRoom4/map.bin"
 
-	.incbin "baserom.gba", 0x2e9d9a, 0x2
-
+	.align 2
 LinkContestRoom4_MapAttributes:: @ 82E9D9C
 	.4byte 0xf
 	.4byte 0xb
 	.4byte LinkContestRoom4_MapBorder
 	.4byte LinkContestRoom4_MapBlockdata
-	.4byte LinkContestRoom4_Tileset
-	.4byte LinkContestRoom4_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Contest
 
 LinkContestRoom5_MapBorder:: @ 82E9DB4
 	.incbin "data/maps/LinkContestRoom5/border.bin"
@@ -3247,15 +3302,14 @@ LinkContestRoom5_MapBorder:: @ 82E9DB4
 LinkContestRoom5_MapBlockdata:: @ 82E9DBC
 	.incbin "data/maps/LinkContestRoom5/map.bin"
 
-	.incbin "baserom.gba", 0x2e9f06, 0x2
-
+	.align 2
 LinkContestRoom5_MapAttributes:: @ 82E9F08
 	.4byte 0xf
 	.4byte 0xb
 	.4byte LinkContestRoom5_MapBorder
 	.4byte LinkContestRoom5_MapBlockdata
-	.4byte LinkContestRoom5_Tileset
-	.4byte LinkContestRoom5_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Contest
 
 LinkContestRoom6_MapBorder:: @ 82E9F20
 	.incbin "data/maps/LinkContestRoom6/border.bin"
@@ -3263,15 +3317,14 @@ LinkContestRoom6_MapBorder:: @ 82E9F20
 LinkContestRoom6_MapBlockdata:: @ 82E9F28
 	.incbin "data/maps/LinkContestRoom6/map.bin"
 
-	.incbin "baserom.gba", 0x2ea072, 0x2
-
+	.align 2
 LinkContestRoom6_MapAttributes:: @ 82EA074
 	.4byte 0xf
 	.4byte 0xb
 	.4byte LinkContestRoom6_MapBorder
 	.4byte LinkContestRoom6_MapBlockdata
-	.4byte LinkContestRoom6_Tileset
-	.4byte LinkContestRoom6_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Contest
 
 InsideOfTruck_MapBorder:: @ 82EA08C
 	.incbin "data/maps/InsideOfTruck/border.bin"
@@ -3279,15 +3332,14 @@ InsideOfTruck_MapBorder:: @ 82EA08C
 InsideOfTruck_MapBlockdata:: @ 82EA094
 	.incbin "data/maps/InsideOfTruck/map.bin"
 
-	.incbin "baserom.gba", 0x2ea0c6, 0x2
-
+	.align 2
 InsideOfTruck_MapAttributes:: @ 82EA0C8
 	.4byte 0x5
 	.4byte 0x5
 	.4byte InsideOfTruck_MapBorder
 	.4byte InsideOfTruck_MapBlockdata
-	.4byte InsideOfTruck_Tileset
-	.4byte InsideOfTruck_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_InsideOfTruck
 
 SafariZone_Northwest_MapBorder:: @ 82EA0E0
 	.incbin "data/maps/SafariZone_Northwest/border.bin"
@@ -3295,13 +3347,14 @@ SafariZone_Northwest_MapBorder:: @ 82EA0E0
 SafariZone_Northwest_MapBlockdata:: @ 82EA0E8
 	.incbin "data/maps/SafariZone_Northwest/map.bin"
 
+	.align 2
 SafariZone_Northwest_MapAttributes:: @ 82EAD68
 	.4byte 0x28
 	.4byte 0x28
 	.4byte SafariZone_Northwest_MapBorder
 	.4byte SafariZone_Northwest_MapBlockdata
-	.4byte SafariZone_Northwest_Tileset
-	.4byte SafariZone_Northwest_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
 
 SafariZone_Northeast_MapBorder:: @ 82EAD80
 	.incbin "data/maps/SafariZone_Northeast/border.bin"
@@ -3309,13 +3362,14 @@ SafariZone_Northeast_MapBorder:: @ 82EAD80
 SafariZone_Northeast_MapBlockdata:: @ 82EAD88
 	.incbin "data/maps/SafariZone_Northeast/map.bin"
 
+	.align 2
 SafariZone_Northeast_MapAttributes:: @ 82EBA08
 	.4byte 0x28
 	.4byte 0x28
 	.4byte SafariZone_Northeast_MapBorder
 	.4byte SafariZone_Northeast_MapBlockdata
-	.4byte SafariZone_Northeast_Tileset
-	.4byte SafariZone_Northeast_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
 
 SafariZone_Southwest_MapBorder:: @ 82EBA20
 	.incbin "data/maps/SafariZone_Southwest/border.bin"
@@ -3323,13 +3377,14 @@ SafariZone_Southwest_MapBorder:: @ 82EBA20
 SafariZone_Southwest_MapBlockdata:: @ 82EBA28
 	.incbin "data/maps/SafariZone_Southwest/map.bin"
 
+	.align 2
 SafariZone_Southwest_MapAttributes:: @ 82EC6A8
 	.4byte 0x28
 	.4byte 0x28
 	.4byte SafariZone_Southwest_MapBorder
 	.4byte SafariZone_Southwest_MapBlockdata
-	.4byte SafariZone_Southwest_Tileset
-	.4byte SafariZone_Southwest_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
 
 SafariZone_Southeast_MapBorder:: @ 82EC6C0
 	.incbin "data/maps/SafariZone_Southeast/border.bin"
@@ -3337,13 +3392,14 @@ SafariZone_Southeast_MapBorder:: @ 82EC6C0
 SafariZone_Southeast_MapBlockdata:: @ 82EC6C8
 	.incbin "data/maps/SafariZone_Southeast/map.bin"
 
+	.align 2
 SafariZone_Southeast_MapAttributes:: @ 82ED348
 	.4byte 0x28
 	.4byte 0x28
 	.4byte SafariZone_Southeast_MapBorder
 	.4byte SafariZone_Southeast_MapBlockdata
-	.4byte SafariZone_Southeast_Tileset
-	.4byte SafariZone_Southeast_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
 
 	.incbin "baserom.gba", 0x2ed360, 0xbe8
 
@@ -3353,13 +3409,14 @@ Route109_SeashoreHouse_MapBorder:: @ 82EDF48
 Route109_SeashoreHouse_MapBlockdata:: @ 82EDF50
 	.incbin "data/maps/Route109_SeashoreHouse/map.bin"
 
+	.align 2
 Route109_SeashoreHouse_MapAttributes:: @ 82EE07C
 	.4byte 0xf
 	.4byte 0xa
 	.4byte Route109_SeashoreHouse_MapBorder
 	.4byte Route109_SeashoreHouse_MapBlockdata
-	.4byte Route109_SeashoreHouse_Tileset
-	.4byte Route109_SeashoreHouse_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_SeashoreHouse
 
 Route110_TrickHouseEntrance_MapBorder:: @ 82EE094
 	.incbin "data/maps/Route110_TrickHouseEntrance/border.bin"
@@ -3367,13 +3424,14 @@ Route110_TrickHouseEntrance_MapBorder:: @ 82EE094
 Route110_TrickHouseEntrance_MapBlockdata:: @ 82EE09C
 	.incbin "data/maps/Route110_TrickHouseEntrance/map.bin"
 
+	.align 2
 Route110_TrickHouseEntrance_MapAttributes:: @ 82EE15C
 	.4byte 0xc
 	.4byte 0x8
 	.4byte Route110_TrickHouseEntrance_MapBorder
 	.4byte Route110_TrickHouseEntrance_MapBlockdata
-	.4byte Route110_TrickHouseEntrance_Tileset
-	.4byte Route110_TrickHouseEntrance_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 Route110_TrickHouseEnd_MapBorder:: @ 82EE174
 	.incbin "data/maps/Route110_TrickHouseEnd/border.bin"
@@ -3381,13 +3439,14 @@ Route110_TrickHouseEnd_MapBorder:: @ 82EE174
 Route110_TrickHouseEnd_MapBlockdata:: @ 82EE17C
 	.incbin "data/maps/Route110_TrickHouseEnd/map.bin"
 
+	.align 2
 Route110_TrickHouseEnd_MapAttributes:: @ 82EE23C
 	.4byte 0xc
 	.4byte 0x8
 	.4byte Route110_TrickHouseEnd_MapBorder
 	.4byte Route110_TrickHouseEnd_MapBlockdata
-	.4byte Route110_TrickHouseEnd_Tileset
-	.4byte Route110_TrickHouseEnd_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 Route110_TrickHouseCorridor_MapBorder:: @ 82EE254
 	.incbin "data/maps/Route110_TrickHouseCorridor/border.bin"
@@ -3395,13 +3454,14 @@ Route110_TrickHouseCorridor_MapBorder:: @ 82EE254
 Route110_TrickHouseCorridor_MapBlockdata:: @ 82EE25C
 	.incbin "data/maps/Route110_TrickHouseCorridor/map.bin"
 
+	.align 2
 Route110_TrickHouseCorridor_MapAttributes:: @ 82EE52C
 	.4byte 0xf
 	.4byte 0x18
 	.4byte Route110_TrickHouseCorridor_MapBorder
 	.4byte Route110_TrickHouseCorridor_MapBlockdata
-	.4byte Route110_TrickHouseCorridor_Tileset
-	.4byte Route110_TrickHouseCorridor_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 Route110_TrickHousePuzzle1_MapBorder:: @ 82EE544
 	.incbin "data/maps/Route110_TrickHousePuzzle1/border.bin"
@@ -3409,13 +3469,14 @@ Route110_TrickHousePuzzle1_MapBorder:: @ 82EE544
 Route110_TrickHousePuzzle1_MapBlockdata:: @ 82EE54C
 	.incbin "data/maps/Route110_TrickHousePuzzle1/map.bin"
 
+	.align 2
 Route110_TrickHousePuzzle1_MapAttributes:: @ 82EE7E0
 	.4byte 0xf
 	.4byte 0x16
 	.4byte Route110_TrickHousePuzzle1_MapBorder
 	.4byte Route110_TrickHousePuzzle1_MapBlockdata
-	.4byte Route110_TrickHousePuzzle1_Tileset
-	.4byte Route110_TrickHousePuzzle1_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
 
 Route110_TrickHousePuzzle2_MapBorder:: @ 82EE7F8
 	.incbin "data/maps/Route110_TrickHousePuzzle2/border.bin"
@@ -3423,13 +3484,14 @@ Route110_TrickHousePuzzle2_MapBorder:: @ 82EE7F8
 Route110_TrickHousePuzzle2_MapBlockdata:: @ 82EE800
 	.incbin "data/maps/Route110_TrickHousePuzzle2/map.bin"
 
+	.align 2
 Route110_TrickHousePuzzle2_MapAttributes:: @ 82EEA94
 	.4byte 0xf
 	.4byte 0x16
 	.4byte Route110_TrickHousePuzzle2_MapBorder
 	.4byte Route110_TrickHousePuzzle2_MapBlockdata
-	.4byte Route110_TrickHousePuzzle2_Tileset
-	.4byte Route110_TrickHousePuzzle2_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
 
 Route110_TrickHousePuzzle3_MapBorder:: @ 82EEAAC
 	.incbin "data/maps/Route110_TrickHousePuzzle3/border.bin"
@@ -3437,13 +3499,14 @@ Route110_TrickHousePuzzle3_MapBorder:: @ 82EEAAC
 Route110_TrickHousePuzzle3_MapBlockdata:: @ 82EEAB4
 	.incbin "data/maps/Route110_TrickHousePuzzle3/map.bin"
 
+	.align 2
 Route110_TrickHousePuzzle3_MapAttributes:: @ 82EED48
 	.4byte 0xf
 	.4byte 0x16
 	.4byte Route110_TrickHousePuzzle3_MapBorder
 	.4byte Route110_TrickHousePuzzle3_MapBlockdata
-	.4byte Route110_TrickHousePuzzle3_Tileset
-	.4byte Route110_TrickHousePuzzle3_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
 
 Route110_TrickHousePuzzle4_MapBorder:: @ 82EED60
 	.incbin "data/maps/Route110_TrickHousePuzzle4/border.bin"
@@ -3451,13 +3514,14 @@ Route110_TrickHousePuzzle4_MapBorder:: @ 82EED60
 Route110_TrickHousePuzzle4_MapBlockdata:: @ 82EED68
 	.incbin "data/maps/Route110_TrickHousePuzzle4/map.bin"
 
+	.align 2
 Route110_TrickHousePuzzle4_MapAttributes:: @ 82EEFFC
 	.4byte 0xf
 	.4byte 0x16
 	.4byte Route110_TrickHousePuzzle4_MapBorder
 	.4byte Route110_TrickHousePuzzle4_MapBlockdata
-	.4byte Route110_TrickHousePuzzle4_Tileset
-	.4byte Route110_TrickHousePuzzle4_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
 
 Route110_TrickHousePuzzle5_MapBorder:: @ 82EF014
 	.incbin "data/maps/Route110_TrickHousePuzzle5/border.bin"
@@ -3465,13 +3529,14 @@ Route110_TrickHousePuzzle5_MapBorder:: @ 82EF014
 Route110_TrickHousePuzzle5_MapBlockdata:: @ 82EF01C
 	.incbin "data/maps/Route110_TrickHousePuzzle5/map.bin"
 
+	.align 2
 Route110_TrickHousePuzzle5_MapAttributes:: @ 82EF2B0
 	.4byte 0xf
 	.4byte 0x16
 	.4byte Route110_TrickHousePuzzle5_MapBorder
 	.4byte Route110_TrickHousePuzzle5_MapBlockdata
-	.4byte Route110_TrickHousePuzzle5_Tileset
-	.4byte Route110_TrickHousePuzzle5_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
 
 Route110_TrickHousePuzzle6_MapBorder:: @ 82EF2C8
 	.incbin "data/maps/Route110_TrickHousePuzzle6/border.bin"
@@ -3479,13 +3544,14 @@ Route110_TrickHousePuzzle6_MapBorder:: @ 82EF2C8
 Route110_TrickHousePuzzle6_MapBlockdata:: @ 82EF2D0
 	.incbin "data/maps/Route110_TrickHousePuzzle6/map.bin"
 
+	.align 2
 Route110_TrickHousePuzzle6_MapAttributes:: @ 82EF564
 	.4byte 0xf
 	.4byte 0x16
 	.4byte Route110_TrickHousePuzzle6_MapBorder
 	.4byte Route110_TrickHousePuzzle6_MapBlockdata
-	.4byte Route110_TrickHousePuzzle6_Tileset
-	.4byte Route110_TrickHousePuzzle6_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
 
 Route110_TrickHousePuzzle7_MapBorder:: @ 82EF57C
 	.incbin "data/maps/Route110_TrickHousePuzzle7/border.bin"
@@ -3493,13 +3559,14 @@ Route110_TrickHousePuzzle7_MapBorder:: @ 82EF57C
 Route110_TrickHousePuzzle7_MapBlockdata:: @ 82EF584
 	.incbin "data/maps/Route110_TrickHousePuzzle7/map.bin"
 
+	.align 2
 Route110_TrickHousePuzzle7_MapAttributes:: @ 82EF818
 	.4byte 0xf
 	.4byte 0x16
 	.4byte Route110_TrickHousePuzzle7_MapBorder
 	.4byte Route110_TrickHousePuzzle7_MapBlockdata
-	.4byte Route110_TrickHousePuzzle7_Tileset
-	.4byte Route110_TrickHousePuzzle7_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
 
 Route110_TrickHousePuzzle8_MapBorder:: @ 82EF830
 	.incbin "data/maps/Route110_TrickHousePuzzle8/border.bin"
@@ -3507,13 +3574,14 @@ Route110_TrickHousePuzzle8_MapBorder:: @ 82EF830
 Route110_TrickHousePuzzle8_MapBlockdata:: @ 82EF838
 	.incbin "data/maps/Route110_TrickHousePuzzle8/map.bin"
 
+	.align 2
 Route110_TrickHousePuzzle8_MapAttributes:: @ 82EFACC
 	.4byte 0xf
 	.4byte 0x16
 	.4byte Route110_TrickHousePuzzle8_MapBorder
 	.4byte Route110_TrickHousePuzzle8_MapBlockdata
-	.4byte Route110_TrickHousePuzzle8_Tileset
-	.4byte Route110_TrickHousePuzzle8_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
 
 FortreeCity_DecorationShop_MapBorder:: @ 82EFAE4
 	.incbin "data/maps/FortreeCity_DecorationShop/border.bin"
@@ -3521,13 +3589,14 @@ FortreeCity_DecorationShop_MapBorder:: @ 82EFAE4
 FortreeCity_DecorationShop_MapBlockdata:: @ 82EFAEC
 	.incbin "data/maps/FortreeCity_DecorationShop/map.bin"
 
+	.align 2
 FortreeCity_DecorationShop_MapAttributes:: @ 82EFB4C
 	.4byte 0x8
 	.4byte 0x6
 	.4byte FortreeCity_DecorationShop_MapBorder
 	.4byte FortreeCity_DecorationShop_MapBlockdata
-	.4byte FortreeCity_DecorationShop_Tileset
-	.4byte FortreeCity_DecorationShop_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 Route110_SeasideCyclingRoadSouthEntrance_MapBorder:: @ 82EFB64
 	.incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin"
@@ -3535,14 +3604,15 @@ Route110_SeasideCyclingRoadSouthEntrance_MapBorder:: @ 82EFB64
 Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata:: @ 82EFB6C
 	.incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin"
 
+	.align 2
 Route110_SeasideCyclingRoadNorthEntrance_MapAttributes:: @ 82EFC20
 Route110_SeasideCyclingRoadSouthEntrance_MapAttributes:: @ 82EFC20
 	.4byte 0xf
 	.4byte 0x6
 	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapBorder
 	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata
-	.4byte Route110_SeasideCyclingRoadSouthEntrance_Tileset
-	.4byte Route110_SeasideCyclingRoadSouthEntrance_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
 
 LilycoveCity_DepartmentStore_1F_MapBorder:: @ 82EFC38
 	.incbin "data/maps/LilycoveCity_DepartmentStore_1F/border.bin"
@@ -3550,13 +3620,14 @@ LilycoveCity_DepartmentStore_1F_MapBorder:: @ 82EFC38
 LilycoveCity_DepartmentStore_1F_MapBlockdata:: @ 82EFC40
 	.incbin "data/maps/LilycoveCity_DepartmentStore_1F/map.bin"
 
+	.align 2
 LilycoveCity_DepartmentStore_1F_MapAttributes:: @ 82EFD60
 	.4byte 0x12
 	.4byte 0x8
 	.4byte LilycoveCity_DepartmentStore_1F_MapBorder
 	.4byte LilycoveCity_DepartmentStore_1F_MapBlockdata
-	.4byte LilycoveCity_DepartmentStore_1F_Tileset
-	.4byte LilycoveCity_DepartmentStore_1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
 
 LilycoveCity_DepartmentStore_2F_MapBorder:: @ 82EFD78
 	.incbin "data/maps/LilycoveCity_DepartmentStore_2F/border.bin"
@@ -3564,13 +3635,14 @@ LilycoveCity_DepartmentStore_2F_MapBorder:: @ 82EFD78
 LilycoveCity_DepartmentStore_2F_MapBlockdata:: @ 82EFD80
 	.incbin "data/maps/LilycoveCity_DepartmentStore_2F/map.bin"
 
+	.align 2
 LilycoveCity_DepartmentStore_2F_MapAttributes:: @ 82EFEA0
 	.4byte 0x12
 	.4byte 0x8
 	.4byte LilycoveCity_DepartmentStore_2F_MapBorder
 	.4byte LilycoveCity_DepartmentStore_2F_MapBlockdata
-	.4byte LilycoveCity_DepartmentStore_2F_Tileset
-	.4byte LilycoveCity_DepartmentStore_2F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
 
 LilycoveCity_DepartmentStore_3F_MapBorder:: @ 82EFEB8
 	.incbin "data/maps/LilycoveCity_DepartmentStore_3F/border.bin"
@@ -3578,13 +3650,14 @@ LilycoveCity_DepartmentStore_3F_MapBorder:: @ 82EFEB8
 LilycoveCity_DepartmentStore_3F_MapBlockdata:: @ 82EFEC0
 	.incbin "data/maps/LilycoveCity_DepartmentStore_3F/map.bin"
 
+	.align 2
 LilycoveCity_DepartmentStore_3F_MapAttributes:: @ 82EFFE0
 	.4byte 0x12
 	.4byte 0x8
 	.4byte LilycoveCity_DepartmentStore_3F_MapBorder
 	.4byte LilycoveCity_DepartmentStore_3F_MapBlockdata
-	.4byte LilycoveCity_DepartmentStore_3F_Tileset
-	.4byte LilycoveCity_DepartmentStore_3F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
 
 LilycoveCity_DepartmentStore_4F_MapBorder:: @ 82EFFF8
 	.incbin "data/maps/LilycoveCity_DepartmentStore_4F/border.bin"
@@ -3592,13 +3665,14 @@ LilycoveCity_DepartmentStore_4F_MapBorder:: @ 82EFFF8
 LilycoveCity_DepartmentStore_4F_MapBlockdata:: @ 82F0000
 	.incbin "data/maps/LilycoveCity_DepartmentStore_4F/map.bin"
 
+	.align 2
 LilycoveCity_DepartmentStore_4F_MapAttributes:: @ 82F0120
 	.4byte 0x12
 	.4byte 0x8
 	.4byte LilycoveCity_DepartmentStore_4F_MapBorder
 	.4byte LilycoveCity_DepartmentStore_4F_MapBlockdata
-	.4byte LilycoveCity_DepartmentStore_4F_Tileset
-	.4byte LilycoveCity_DepartmentStore_4F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
 
 LilycoveCity_DepartmentStore_5F_MapBorder:: @ 82F0138
 	.incbin "data/maps/LilycoveCity_DepartmentStore_5F/border.bin"
@@ -3606,13 +3680,14 @@ LilycoveCity_DepartmentStore_5F_MapBorder:: @ 82F0138
 LilycoveCity_DepartmentStore_5F_MapBlockdata:: @ 82F0140
 	.incbin "data/maps/LilycoveCity_DepartmentStore_5F/map.bin"
 
+	.align 2
 LilycoveCity_DepartmentStore_5F_MapAttributes:: @ 82F0260
 	.4byte 0x12
 	.4byte 0x8
 	.4byte LilycoveCity_DepartmentStore_5F_MapBorder
 	.4byte LilycoveCity_DepartmentStore_5F_MapBlockdata
-	.4byte LilycoveCity_DepartmentStore_5F_Tileset
-	.4byte LilycoveCity_DepartmentStore_5F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
 
 LilycoveCity_DepartmentStoreRooftop_MapBorder:: @ 82F0278
 	.incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin"
@@ -3620,13 +3695,14 @@ LilycoveCity_DepartmentStoreRooftop_MapBorder:: @ 82F0278
 LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: @ 82F0280
 	.incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin"
 
+	.align 2
 LilycoveCity_DepartmentStoreRooftop_MapAttributes:: @ 82F0430
 	.4byte 0x12
 	.4byte 0xc
 	.4byte LilycoveCity_DepartmentStoreRooftop_MapBorder
 	.4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata
-	.4byte LilycoveCity_DepartmentStoreRooftop_Tileset
-	.4byte LilycoveCity_DepartmentStoreRooftop_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
 
 Route130_MapBorder:: @ 82F0448
 	.incbin "data/maps/Route130/border.bin"
@@ -3634,13 +3710,14 @@ Route130_MapBorder:: @ 82F0448
 Route130_MapBlockdata:: @ 82F0450
 	.incbin "data/maps/Route130/map.bin"
 
+	.align 2
 Route130_MapAttributes:: @ 82F1D50
 	.4byte 0x50
 	.4byte 0x28
 	.4byte Route130_MapBorder
 	.4byte Route130_MapBlockdata
-	.4byte Route130_Tileset
-	.4byte Route130_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 BattleTower_Lobby_MapBorder:: @ 82F1D68
 	.incbin "data/maps/BattleTower_Lobby/border.bin"
@@ -3648,13 +3725,14 @@ BattleTower_Lobby_MapBorder:: @ 82F1D68
 BattleTower_Lobby_MapBlockdata:: @ 82F1D70
 	.incbin "data/maps/BattleTower_Lobby/map.bin"
 
+	.align 2
 BattleTower_Lobby_MapAttributes:: @ 82F1E6C
 	.4byte 0xe
 	.4byte 0x9
 	.4byte BattleTower_Lobby_MapBorder
 	.4byte BattleTower_Lobby_MapBlockdata
-	.4byte BattleTower_Lobby_Tileset
-	.4byte BattleTower_Lobby_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
 
 BattleTower_Outside_MapBorder:: @ 82F1E84
 	.incbin "data/maps/BattleTower_Outside/border.bin"
@@ -3662,13 +3740,14 @@ BattleTower_Outside_MapBorder:: @ 82F1E84
 BattleTower_Outside_MapBlockdata:: @ 82F1E8C
 	.incbin "data/maps/BattleTower_Outside/map.bin"
 
+	.align 2
 BattleTower_Outside_MapAttributes:: @ 82F2558
 	.4byte 0x1d
 	.4byte 0x1e
 	.4byte BattleTower_Outside_MapBorder
 	.4byte BattleTower_Outside_MapBlockdata
-	.4byte BattleTower_Outside_Tileset
-	.4byte BattleTower_Outside_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
 
 BattleTower_Elevator_MapBorder:: @ 82F2570
 	.incbin "data/maps/BattleTower_Elevator/border.bin"
@@ -3676,13 +3755,14 @@ BattleTower_Elevator_MapBorder:: @ 82F2570
 BattleTower_Elevator_MapBlockdata:: @ 82F2578
 	.incbin "data/maps/BattleTower_Elevator/map.bin"
 
+	.align 2
 BattleTower_Elevator_MapAttributes:: @ 82F25B0
 	.4byte 0x4
 	.4byte 0x7
 	.4byte BattleTower_Elevator_MapBorder
 	.4byte BattleTower_Elevator_MapBlockdata
-	.4byte BattleTower_Elevator_Tileset
-	.4byte BattleTower_Elevator_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
 
 BattleTower_Corridor_MapBorder:: @ 82F25C8
 	.incbin "data/maps/BattleTower_Corridor/border.bin"
@@ -3690,15 +3770,14 @@ BattleTower_Corridor_MapBorder:: @ 82F25C8
 BattleTower_Corridor_MapBlockdata:: @ 82F25D0
 	.incbin "data/maps/BattleTower_Corridor/map.bin"
 
-	.incbin "baserom.gba", 0x2f267a, 0x2
-
+	.align 2
 BattleTower_Corridor_MapAttributes:: @ 82F267C
 	.4byte 0x11
 	.4byte 0x5
 	.4byte BattleTower_Corridor_MapBorder
 	.4byte BattleTower_Corridor_MapBlockdata
-	.4byte BattleTower_Corridor_Tileset
-	.4byte BattleTower_Corridor_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
 
 BattleTower_BattleRoom_MapBorder:: @ 82F2694
 	.incbin "data/maps/BattleTower_BattleRoom/border.bin"
@@ -3706,13 +3785,14 @@ BattleTower_BattleRoom_MapBorder:: @ 82F2694
 BattleTower_BattleRoom_MapBlockdata:: @ 82F269C
 	.incbin "data/maps/BattleTower_BattleRoom/map.bin"
 
+	.align 2
 BattleTower_BattleRoom_MapAttributes:: @ 82F2750
 	.4byte 0xa
 	.4byte 0x9
 	.4byte BattleTower_BattleRoom_MapBorder
 	.4byte BattleTower_BattleRoom_MapBlockdata
-	.4byte BattleTower_BattleRoom_Tileset
-	.4byte BattleTower_BattleRoom_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
 
 RustboroCity_DevonCorp_3F_MapBorder:: @ 82F2768
 	.incbin "data/maps/RustboroCity_DevonCorp_3F/border.bin"
@@ -3720,15 +3800,14 @@ RustboroCity_DevonCorp_3F_MapBorder:: @ 82F2768
 RustboroCity_DevonCorp_3F_MapBlockdata:: @ 82F2770
 	.incbin "data/maps/RustboroCity_DevonCorp_3F/map.bin"
 
-	.incbin "baserom.gba", 0x2f28c6, 0x2
-
+	.align 2
 RustboroCity_DevonCorp_3F_MapAttributes:: @ 82F28C8
 	.4byte 0x13
 	.4byte 0x9
 	.4byte RustboroCity_DevonCorp_3F_MapBorder
 	.4byte RustboroCity_DevonCorp_3F_MapBlockdata
-	.4byte RustboroCity_DevonCorp_3F_Tileset
-	.4byte RustboroCity_DevonCorp_3F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 EverGrandeCity_PokemonLeague_MapBorder:: @ 82F28E0
 	.incbin "data/maps/EverGrandeCity_PokemonLeague/border.bin"
@@ -3736,13 +3815,14 @@ EverGrandeCity_PokemonLeague_MapBorder:: @ 82F28E0
 EverGrandeCity_PokemonLeague_MapBlockdata:: @ 82F28E8
 	.incbin "data/maps/EverGrandeCity_PokemonLeague/map.bin"
 
+	.align 2
 EverGrandeCity_PokemonLeague_MapAttributes:: @ 82F2AB0
 	.4byte 0x13
 	.4byte 0xc
 	.4byte EverGrandeCity_PokemonLeague_MapBorder
 	.4byte EverGrandeCity_PokemonLeague_MapBlockdata
-	.4byte EverGrandeCity_PokemonLeague_Tileset
-	.4byte EverGrandeCity_PokemonLeague_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
 
 Route119_WeatherInstitute_1F_MapBorder:: @ 82F2AC8
 	.incbin "data/maps/Route119_WeatherInstitute_1F/border.bin"
@@ -3750,13 +3830,14 @@ Route119_WeatherInstitute_1F_MapBorder:: @ 82F2AC8
 Route119_WeatherInstitute_1F_MapBlockdata:: @ 82F2AD0
 	.incbin "data/maps/Route119_WeatherInstitute_1F/map.bin"
 
+	.align 2
 Route119_WeatherInstitute_1F_MapAttributes:: @ 82F2CD8
 	.4byte 0x14
 	.4byte 0xd
 	.4byte Route119_WeatherInstitute_1F_MapBorder
 	.4byte Route119_WeatherInstitute_1F_MapBlockdata
-	.4byte Route119_WeatherInstitute_1F_Tileset
-	.4byte Route119_WeatherInstitute_1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
 
 Route119_WeatherInstitute_2F_MapBorder:: @ 82F2CF0
 	.incbin "data/maps/Route119_WeatherInstitute_2F/border.bin"
@@ -3764,13 +3845,14 @@ Route119_WeatherInstitute_2F_MapBorder:: @ 82F2CF0
 Route119_WeatherInstitute_2F_MapBlockdata:: @ 82F2CF8
 	.incbin "data/maps/Route119_WeatherInstitute_2F/map.bin"
 
+	.align 2
 Route119_WeatherInstitute_2F_MapAttributes:: @ 82F2EB0
 	.4byte 0x14
 	.4byte 0xb
 	.4byte Route119_WeatherInstitute_2F_MapBorder
 	.4byte Route119_WeatherInstitute_2F_MapBlockdata
-	.4byte Route119_WeatherInstitute_2F_Tileset
-	.4byte Route119_WeatherInstitute_2F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
 
 LilycoveCity_DepartmentStoreElevator_MapBorder:: @ 82F2EC8
 	.incbin "data/maps/LilycoveCity_DepartmentStoreElevator/border.bin"
@@ -3778,13 +3860,14 @@ LilycoveCity_DepartmentStoreElevator_MapBorder:: @ 82F2EC8
 LilycoveCity_DepartmentStoreElevator_MapBlockdata:: @ 82F2ED0
 	.incbin "data/maps/LilycoveCity_DepartmentStoreElevator/map.bin"
 
+	.align 2
 LilycoveCity_DepartmentStoreElevator_MapAttributes:: @ 82F2F00
 	.4byte 0x4
 	.4byte 0x6
 	.4byte LilycoveCity_DepartmentStoreElevator_MapBorder
 	.4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata
-	.4byte LilycoveCity_DepartmentStoreElevator_Tileset
-	.4byte LilycoveCity_DepartmentStoreElevator_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
 
 Underwater1_MapBorder:: @ 82F2F18
 	.incbin "data/maps/Underwater1/border.bin"
@@ -3792,13 +3875,14 @@ Underwater1_MapBorder:: @ 82F2F18
 Underwater1_MapBlockdata:: @ 82F2F20
 	.incbin "data/maps/Underwater1/map.bin"
 
+	.align 2
 Underwater1_MapAttributes:: @ 82F6120
 	.4byte 0x50
 	.4byte 0x50
 	.4byte Underwater1_MapBorder
 	.4byte Underwater1_MapBlockdata
-	.4byte Underwater1_Tileset
-	.4byte Underwater1_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
 
 MossdeepCity_SpaceCenter_1F_MapBorder:: @ 82F6138
 	.incbin "data/maps/MossdeepCity_SpaceCenter_1F/border.bin"
@@ -3806,13 +3890,14 @@ MossdeepCity_SpaceCenter_1F_MapBorder:: @ 82F6138
 MossdeepCity_SpaceCenter_1F_MapBlockdata:: @ 82F6140
 	.incbin "data/maps/MossdeepCity_SpaceCenter_1F/map.bin"
 
+	.align 2
 MossdeepCity_SpaceCenter_1F_MapAttributes:: @ 82F6280
 	.4byte 0x10
 	.4byte 0xa
 	.4byte MossdeepCity_SpaceCenter_1F_MapBorder
 	.4byte MossdeepCity_SpaceCenter_1F_MapBlockdata
-	.4byte MossdeepCity_SpaceCenter_1F_Tileset
-	.4byte MossdeepCity_SpaceCenter_1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 MossdeepCity_SpaceCenter_2F_MapBorder:: @ 82F6298
 	.incbin "data/maps/MossdeepCity_SpaceCenter_2F/border.bin"
@@ -3820,13 +3905,14 @@ MossdeepCity_SpaceCenter_2F_MapBorder:: @ 82F6298
 MossdeepCity_SpaceCenter_2F_MapBlockdata:: @ 82F62A0
 	.incbin "data/maps/MossdeepCity_SpaceCenter_2F/map.bin"
 
+	.align 2
 MossdeepCity_SpaceCenter_2F_MapAttributes:: @ 82F63E0
 	.4byte 0x10
 	.4byte 0xa
 	.4byte MossdeepCity_SpaceCenter_2F_MapBorder
 	.4byte MossdeepCity_SpaceCenter_2F_MapBlockdata
-	.4byte MossdeepCity_SpaceCenter_2F_Tileset
-	.4byte MossdeepCity_SpaceCenter_2F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 SSTidalCorridor_MapBorder:: @ 82F63F8
 	.incbin "data/maps/SSTidalCorridor/border.bin"
@@ -3834,13 +3920,14 @@ SSTidalCorridor_MapBorder:: @ 82F63F8
 SSTidalCorridor_MapBlockdata:: @ 82F6400
 	.incbin "data/maps/SSTidalCorridor/map.bin"
 
+	.align 2
 SSTidalCorridor_MapAttributes:: @ 82F65D4
 	.4byte 0x12
 	.4byte 0xd
 	.4byte SSTidalCorridor_MapBorder
 	.4byte SSTidalCorridor_MapBlockdata
-	.4byte SSTidalCorridor_Tileset
-	.4byte SSTidalCorridor_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 SSTidalLowerDeck_MapBorder:: @ 82F65EC
 	.incbin "data/maps/SSTidalLowerDeck/border.bin"
@@ -3848,15 +3935,14 @@ SSTidalLowerDeck_MapBorder:: @ 82F65EC
 SSTidalLowerDeck_MapBlockdata:: @ 82F65F4
 	.incbin "data/maps/SSTidalLowerDeck/map.bin"
 
-	.incbin "baserom.gba", 0x2f67ae, 0x2
-
+	.align 2
 SSTidalLowerDeck_MapAttributes:: @ 82F67B0
 	.4byte 0x11
 	.4byte 0xd
 	.4byte SSTidalLowerDeck_MapBorder
 	.4byte SSTidalLowerDeck_MapBlockdata
-	.4byte SSTidalLowerDeck_Tileset
-	.4byte SSTidalLowerDeck_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 SSTidalRooms_MapBorder:: @ 82F67C8
 	.incbin "data/maps/SSTidalRooms/border.bin"
@@ -3864,13 +3950,14 @@ SSTidalRooms_MapBorder:: @ 82F67C8
 SSTidalRooms_MapBlockdata:: @ 82F67D0
 	.incbin "data/maps/SSTidalRooms/map.bin"
 
+	.align 2
 SSTidalRooms_MapAttributes:: @ 82F6CE0
 	.4byte 0x24
 	.4byte 0x12
 	.4byte SSTidalRooms_MapBorder
 	.4byte SSTidalRooms_MapBlockdata
-	.4byte SSTidalRooms_Tileset
-	.4byte SSTidalRooms_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 IslandCave_MapBorder:: @ 82F6CF8
 	.incbin "data/maps/IslandCave/border.bin"
@@ -3878,15 +3965,14 @@ IslandCave_MapBorder:: @ 82F6CF8
 IslandCave_MapBlockdata:: @ 82F6D00
 	.incbin "data/maps/IslandCave/map.bin"
 
-	.incbin "baserom.gba", 0x2f7162, 0x2
-
+	.align 2
 IslandCave_MapAttributes:: @ 82F7164
 	.4byte 0x11
 	.4byte 0x21
 	.4byte IslandCave_MapBorder
 	.4byte IslandCave_MapBlockdata
-	.4byte IslandCave_Tileset
-	.4byte IslandCave_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 AncientTomb_MapBorder:: @ 82F717C
 	.incbin "data/maps/AncientTomb/border.bin"
@@ -3894,15 +3980,14 @@ AncientTomb_MapBorder:: @ 82F717C
 AncientTomb_MapBlockdata:: @ 82F7184
 	.incbin "data/maps/AncientTomb/map.bin"
 
-	.incbin "baserom.gba", 0x2f75e6, 0x2
-
+	.align 2
 AncientTomb_MapAttributes:: @ 82F75E8
 	.4byte 0x11
 	.4byte 0x21
 	.4byte AncientTomb_MapBorder
 	.4byte AncientTomb_MapBlockdata
-	.4byte AncientTomb_Tileset
-	.4byte AncientTomb_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 Underwater_Route134_MapBorder:: @ 82F7600
 	.incbin "data/maps/Underwater_Route134/border.bin"
@@ -3910,13 +3995,14 @@ Underwater_Route134_MapBorder:: @ 82F7600
 Underwater_Route134_MapBlockdata:: @ 82F7608
 	.incbin "data/maps/Underwater_Route134/map.bin"
 
+	.align 2
 Underwater_Route134_MapAttributes:: @ 82F7770
 	.4byte 0x12
 	.4byte 0xa
 	.4byte Underwater_Route134_MapBorder
 	.4byte Underwater_Route134_MapBlockdata
-	.4byte Underwater_Route134_Tileset
-	.4byte Underwater_Route134_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
 
 Underwater_SealedChamber_MapBorder:: @ 82F7788
 	.incbin "data/maps/Underwater_SealedChamber/border.bin"
@@ -3924,13 +4010,14 @@ Underwater_SealedChamber_MapBorder:: @ 82F7788
 Underwater_SealedChamber_MapBlockdata:: @ 82F7790
 	.incbin "data/maps/Underwater_SealedChamber/map.bin"
 
+	.align 2
 Underwater_SealedChamber_MapAttributes:: @ 82F7FD0
 	.4byte 0x16
 	.4byte 0x30
 	.4byte Underwater_SealedChamber_MapBorder
 	.4byte Underwater_SealedChamber_MapBlockdata
-	.4byte Underwater_SealedChamber_Tileset
-	.4byte Underwater_SealedChamber_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
 
 SealedChamber_OuterRoom_MapBorder:: @ 82F7FE8
 	.incbin "data/maps/SealedChamber_OuterRoom/border.bin"
@@ -3938,15 +4025,14 @@ SealedChamber_OuterRoom_MapBorder:: @ 82F7FE8
 SealedChamber_OuterRoom_MapBlockdata:: @ 82F7FF0
 	.incbin "data/maps/SealedChamber_OuterRoom/map.bin"
 
-	.incbin "baserom.gba", 0x2f83b6, 0x2
-
+	.align 2
 SealedChamber_OuterRoom_MapAttributes:: @ 82F83B8
 	.4byte 0x15
 	.4byte 0x17
 	.4byte SealedChamber_OuterRoom_MapBorder
 	.4byte SealedChamber_OuterRoom_MapBlockdata
-	.4byte SealedChamber_OuterRoom_Tileset
-	.4byte SealedChamber_OuterRoom_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 VictoryRoad_B1F_MapBorder:: @ 82F83D0
 	.incbin "data/maps/VictoryRoad_B1F/border.bin"
@@ -3954,13 +4040,14 @@ VictoryRoad_B1F_MapBorder:: @ 82F83D0
 VictoryRoad_B1F_MapBlockdata:: @ 82F83D8
 	.incbin "data/maps/VictoryRoad_B1F/map.bin"
 
+	.align 2
 VictoryRoad_B1F_MapAttributes:: @ 82F8EFC
 	.4byte 0x2e
 	.4byte 0x1f
 	.4byte VictoryRoad_B1F_MapBorder
 	.4byte VictoryRoad_B1F_MapBlockdata
-	.4byte VictoryRoad_B1F_Tileset
-	.4byte VictoryRoad_B1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 VictoryRoad_B2F_MapBorder:: @ 82F8F14
 	.incbin "data/maps/VictoryRoad_B2F/border.bin"
@@ -3968,13 +4055,14 @@ VictoryRoad_B2F_MapBorder:: @ 82F8F14
 VictoryRoad_B2F_MapBlockdata:: @ 82F8F1C
 	.incbin "data/maps/VictoryRoad_B2F/map.bin"
 
+	.align 2
 VictoryRoad_B2F_MapAttributes:: @ 82F9A40
 	.4byte 0x2e
 	.4byte 0x1f
 	.4byte VictoryRoad_B2F_MapBorder
 	.4byte VictoryRoad_B2F_MapBlockdata
-	.4byte VictoryRoad_B2F_Tileset
-	.4byte VictoryRoad_B2F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 Route104_Prototype_MapBorder:: @ 82F9A58
 	.incbin "data/maps/Route104_Prototype/border.bin"
@@ -3982,15 +4070,14 @@ Route104_Prototype_MapBorder:: @ 82F9A58
 Route104_Prototype_MapBlockdata:: @ 82F9A60
 	.incbin "data/maps/Route104_Prototype/map.bin"
 
-	.incbin "baserom.gba", 0x2f9a62, 0x2
-
+	.align 2
 Route104_Prototype_MapAttributes:: @ 82F9A64
 	.4byte 0x1
 	.4byte 0x1
 	.4byte Route104_Prototype_MapBorder
 	.4byte Route104_Prototype_MapBlockdata
-	.4byte Route104_Prototype_Tileset
-	.4byte Route104_Prototype_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
 
 GraniteCave_StevensRoom_MapBorder:: @ 82F9A7C
 	.incbin "data/maps/GraniteCave_StevensRoom/border.bin"
@@ -3998,13 +4085,14 @@ GraniteCave_StevensRoom_MapBorder:: @ 82F9A7C
 GraniteCave_StevensRoom_MapBlockdata:: @ 82F9A84
 	.incbin "data/maps/GraniteCave_StevensRoom/map.bin"
 
+	.align 2
 GraniteCave_StevensRoom_MapAttributes:: @ 82F9C28
 	.4byte 0xf
 	.4byte 0xe
 	.4byte GraniteCave_StevensRoom_MapBorder
 	.4byte GraniteCave_StevensRoom_MapBlockdata
-	.4byte GraniteCave_StevensRoom_Tileset
-	.4byte GraniteCave_StevensRoom_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 AbandonedShip_HiddenFloorCorridors_MapBorder:: @ 82F9C40
 	.incbin "data/maps/AbandonedShip_HiddenFloorCorridors/border.bin"
@@ -4012,15 +4100,14 @@ AbandonedShip_HiddenFloorCorridors_MapBorder:: @ 82F9C40
 AbandonedShip_HiddenFloorCorridors_MapBlockdata:: @ 82F9C48
 	.incbin "data/maps/AbandonedShip_HiddenFloorCorridors/map.bin"
 
-	.incbin "baserom.gba", 0x2f9d66, 0x2
-
+	.align 2
 AbandonedShip_HiddenFloorCorridors_MapAttributes:: @ 82F9D68
 	.4byte 0xd
 	.4byte 0xb
 	.4byte AbandonedShip_HiddenFloorCorridors_MapBorder
 	.4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
-	.4byte AbandonedShip_HiddenFloorCorridors_Tileset
-	.4byte AbandonedShip_HiddenFloorCorridors_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 SouthernIsland_Exterior_MapBorder:: @ 82F9D80
 	.incbin "data/maps/SouthernIsland_Exterior/border.bin"
@@ -4028,13 +4115,14 @@ SouthernIsland_Exterior_MapBorder:: @ 82F9D80
 SouthernIsland_Exterior_MapBlockdata:: @ 82F9D88
 	.incbin "data/maps/SouthernIsland_Exterior/map.bin"
 
+	.align 2
 SouthernIsland_Exterior_MapAttributes:: @ 82FA544
 	.4byte 0x21
 	.4byte 0x1e
 	.4byte SouthernIsland_Exterior_MapBorder
 	.4byte SouthernIsland_Exterior_MapBlockdata
-	.4byte SouthernIsland_Exterior_Tileset
-	.4byte SouthernIsland_Exterior_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
 
 SouthernIsland_Interior_MapBorder:: @ 82FA55C
 	.incbin "data/maps/SouthernIsland_Interior/border.bin"
@@ -4042,13 +4130,14 @@ SouthernIsland_Interior_MapBorder:: @ 82FA55C
 SouthernIsland_Interior_MapBlockdata:: @ 82FA564
 	.incbin "data/maps/SouthernIsland_Interior/map.bin"
 
+	.align 2
 SouthernIsland_Interior_MapAttributes:: @ 82FAA74
 	.4byte 0x1b
 	.4byte 0x18
 	.4byte SouthernIsland_Interior_MapBorder
 	.4byte SouthernIsland_Interior_MapBlockdata
-	.4byte SouthernIsland_Interior_Tileset
-	.4byte SouthernIsland_Interior_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
 
 JaggedPass_MapBorder:: @ 82FAA8C
 	.incbin "data/maps/JaggedPass/border.bin"
@@ -4056,13 +4145,14 @@ JaggedPass_MapBorder:: @ 82FAA8C
 JaggedPass_MapBlockdata:: @ 82FAA94
 	.incbin "data/maps/JaggedPass/map.bin"
 
+	.align 2
 JaggedPass_MapAttributes:: @ 82FB55C
 	.4byte 0x1e
 	.4byte 0x2e
 	.4byte JaggedPass_MapBorder
 	.4byte JaggedPass_MapBlockdata
-	.4byte JaggedPass_Tileset
-	.4byte JaggedPass_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
 
 FieryPath_MapBorder:: @ 82FB574
 	.incbin "data/maps/FieryPath/border.bin"
@@ -4070,13 +4160,14 @@ FieryPath_MapBorder:: @ 82FB574
 FieryPath_MapBlockdata:: @ 82FB57C
 	.incbin "data/maps/FieryPath/map.bin"
 
+	.align 2
 FieryPath_MapAttributes:: @ 82FBFE0
 	.4byte 0x23
 	.4byte 0x26
 	.4byte FieryPath_MapBorder
 	.4byte FieryPath_MapBlockdata
-	.4byte FieryPath_Tileset
-	.4byte FieryPath_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
 
 RustboroCity_Flat2_1F_MapBorder:: @ 82FBFF8
 	.incbin "data/maps/RustboroCity_Flat2_1F/border.bin"
@@ -4084,13 +4175,14 @@ RustboroCity_Flat2_1F_MapBorder:: @ 82FBFF8
 RustboroCity_Flat2_1F_MapBlockdata:: @ 82FC000
 	.incbin "data/maps/RustboroCity_Flat2_1F/map.bin"
 
+	.align 2
 RustboroCity_Flat2_1F_MapAttributes:: @ 82FC0FC
 	.4byte 0xe
 	.4byte 0x9
 	.4byte RustboroCity_Flat2_1F_MapBorder
 	.4byte RustboroCity_Flat2_1F_MapBlockdata
-	.4byte RustboroCity_Flat2_1F_Tileset
-	.4byte RustboroCity_Flat2_1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 RustboroCity_Flat2_2F_MapBorder:: @ 82FC114
 	.incbin "data/maps/RustboroCity_Flat2_2F/border.bin"
@@ -4098,13 +4190,14 @@ RustboroCity_Flat2_2F_MapBorder:: @ 82FC114
 RustboroCity_Flat2_2F_MapBlockdata:: @ 82FC11C
 	.incbin "data/maps/RustboroCity_Flat2_2F/map.bin"
 
+	.align 2
 RustboroCity_Flat2_2F_MapAttributes:: @ 82FC218
 	.4byte 0xe
 	.4byte 0x9
 	.4byte RustboroCity_Flat2_2F_MapBorder
 	.4byte RustboroCity_Flat2_2F_MapBlockdata
-	.4byte RustboroCity_Flat2_2F_Tileset
-	.4byte RustboroCity_Flat2_2F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 RustboroCity_Flat2_3F_MapBorder:: @ 82FC230
 	.incbin "data/maps/RustboroCity_Flat2_3F/border.bin"
@@ -4112,13 +4205,14 @@ RustboroCity_Flat2_3F_MapBorder:: @ 82FC230
 RustboroCity_Flat2_3F_MapBlockdata:: @ 82FC238
 	.incbin "data/maps/RustboroCity_Flat2_3F/map.bin"
 
+	.align 2
 RustboroCity_Flat2_3F_MapAttributes:: @ 82FC334
 	.4byte 0xe
 	.4byte 0x9
 	.4byte RustboroCity_Flat2_3F_MapBorder
 	.4byte RustboroCity_Flat2_3F_MapBlockdata
-	.4byte RustboroCity_Flat2_3F_Tileset
-	.4byte RustboroCity_Flat2_3F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 SootopolisCity_House8_MapBorder:: @ 82FC34C
 	.incbin "data/maps/SootopolisCity_House8/border.bin"
@@ -4126,13 +4220,14 @@ SootopolisCity_House8_MapBorder:: @ 82FC34C
 SootopolisCity_House8_MapBlockdata:: @ 82FC354
 	.incbin "data/maps/SootopolisCity_House8/map.bin"
 
+	.align 2
 SootopolisCity_House8_MapAttributes:: @ 82FC3C4
 	.4byte 0x8
 	.4byte 0x7
 	.4byte SootopolisCity_House8_MapBorder
 	.4byte SootopolisCity_House8_MapBlockdata
-	.4byte SootopolisCity_House8_Tileset
-	.4byte SootopolisCity_House8_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 EverGrandeCity_HallOfFame_MapBorder:: @ 82FC3DC
 	.incbin "data/maps/EverGrandeCity_HallOfFame/border.bin"
@@ -4140,15 +4235,14 @@ EverGrandeCity_HallOfFame_MapBorder:: @ 82FC3DC
 EverGrandeCity_HallOfFame_MapBlockdata:: @ 82FC3E4
 	.incbin "data/maps/EverGrandeCity_HallOfFame/map.bin"
 
-	.incbin "baserom.gba", 0x2fc5e2, 0x2
-
+	.align 2
 EverGrandeCity_HallOfFame_MapAttributes:: @ 82FC5E4
 	.4byte 0xf
 	.4byte 0x11
 	.4byte EverGrandeCity_HallOfFame_MapBorder
 	.4byte EverGrandeCity_HallOfFame_MapBlockdata
-	.4byte EverGrandeCity_HallOfFame_Tileset
-	.4byte EverGrandeCity_HallOfFame_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
 
 LilycoveCity_CoveLilyMotel_1F_MapBorder:: @ 82FC5FC
 	.incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin"
@@ -4156,13 +4250,14 @@ LilycoveCity_CoveLilyMotel_1F_MapBorder:: @ 82FC5FC
 LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: @ 82FC604
 	.incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin"
 
+	.align 2
 LilycoveCity_CoveLilyMotel_1F_MapAttributes:: @ 82FC6DC
 	.4byte 0xc
 	.4byte 0x9
 	.4byte LilycoveCity_CoveLilyMotel_1F_MapBorder
 	.4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata
-	.4byte LilycoveCity_CoveLilyMotel_1F_Tileset
-	.4byte LilycoveCity_CoveLilyMotel_1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 LilycoveCity_CoveLilyMotel_2F_MapBorder:: @ 82FC6F4
 	.incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin"
@@ -4170,13 +4265,14 @@ LilycoveCity_CoveLilyMotel_2F_MapBorder:: @ 82FC6F4
 LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: @ 82FC6FC
 	.incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin"
 
+	.align 2
 LilycoveCity_CoveLilyMotel_2F_MapAttributes:: @ 82FC7D4
 	.4byte 0xc
 	.4byte 0x9
 	.4byte LilycoveCity_CoveLilyMotel_2F_MapBorder
 	.4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata
-	.4byte LilycoveCity_CoveLilyMotel_2F_Tileset
-	.4byte LilycoveCity_CoveLilyMotel_2F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 Route124_DivingTreasureHuntersHouse_MapBorder:: @ 82FC7EC
 	.incbin "data/maps/Route124_DivingTreasureHuntersHouse/border.bin"
@@ -4184,13 +4280,14 @@ Route124_DivingTreasureHuntersHouse_MapBorder:: @ 82FC7EC
 Route124_DivingTreasureHuntersHouse_MapBlockdata:: @ 82FC7F4
 	.incbin "data/maps/Route124_DivingTreasureHuntersHouse/map.bin"
 
+	.align 2
 Route124_DivingTreasureHuntersHouse_MapAttributes:: @ 82FC8A8
 	.4byte 0xa
 	.4byte 0x9
 	.4byte Route124_DivingTreasureHuntersHouse_MapBorder
 	.4byte Route124_DivingTreasureHuntersHouse_MapBlockdata
-	.4byte Route124_DivingTreasureHuntersHouse_Tileset
-	.4byte Route124_DivingTreasureHuntersHouse_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 MtPyre_Exterior_MapBorder:: @ 82FC8C0
 	.incbin "data/maps/MtPyre_Exterior/border.bin"
@@ -4198,13 +4295,14 @@ MtPyre_Exterior_MapBorder:: @ 82FC8C0
 MtPyre_Exterior_MapBlockdata:: @ 82FC8C8
 	.incbin "data/maps/MtPyre_Exterior/map.bin"
 
+	.align 2
 MtPyre_Exterior_MapAttributes:: @ 82FD7EC
 	.4byte 0x26
 	.4byte 0x33
 	.4byte MtPyre_Exterior_MapBorder
 	.4byte MtPyre_Exterior_MapBlockdata
-	.4byte MtPyre_Exterior_Tileset
-	.4byte MtPyre_Exterior_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 MtPyre_Summit_MapBorder:: @ 82FD804
 	.incbin "data/maps/MtPyre_Summit/border.bin"
@@ -4212,13 +4310,14 @@ MtPyre_Summit_MapBorder:: @ 82FD804
 MtPyre_Summit_MapBlockdata:: @ 82FD80C
 	.incbin "data/maps/MtPyre_Summit/map.bin"
 
+	.align 2
 MtPyre_Summit_MapAttributes:: @ 82FE680
 	.4byte 0x32
 	.4byte 0x25
 	.4byte MtPyre_Summit_MapBorder
 	.4byte MtPyre_Summit_MapBlockdata
-	.4byte MtPyre_Summit_Tileset
-	.4byte MtPyre_Summit_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 SealedChamber_InnerRoom_MapBorder:: @ 82FE698
 	.incbin "data/maps/SealedChamber_InnerRoom/border.bin"
@@ -4226,15 +4325,14 @@ SealedChamber_InnerRoom_MapBorder:: @ 82FE698
 SealedChamber_InnerRoom_MapBlockdata:: @ 82FE6A0
 	.incbin "data/maps/SealedChamber_InnerRoom/map.bin"
 
-	.incbin "baserom.gba", 0x2fea66, 0x2
-
+	.align 2
 SealedChamber_InnerRoom_MapAttributes:: @ 82FEA68
 	.4byte 0x15
 	.4byte 0x17
 	.4byte SealedChamber_InnerRoom_MapBorder
 	.4byte SealedChamber_InnerRoom_MapBlockdata
-	.4byte SealedChamber_InnerRoom_Tileset
-	.4byte SealedChamber_InnerRoom_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 MossdeepCity_GameCorner_1F_MapBorder:: @ 82FEA80
 	.incbin "data/maps/MossdeepCity_GameCorner_1F/border.bin"
@@ -4242,13 +4340,14 @@ MossdeepCity_GameCorner_1F_MapBorder:: @ 82FEA80
 MossdeepCity_GameCorner_1F_MapBlockdata:: @ 82FEA88
 	.incbin "data/maps/MossdeepCity_GameCorner_1F/map.bin"
 
+	.align 2
 MossdeepCity_GameCorner_1F_MapAttributes:: @ 82FEB38
 	.4byte 0xb
 	.4byte 0x8
 	.4byte MossdeepCity_GameCorner_1F_MapBorder
 	.4byte MossdeepCity_GameCorner_1F_MapBlockdata
-	.4byte MossdeepCity_GameCorner_1F_Tileset
-	.4byte MossdeepCity_GameCorner_1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 MossdeepCity_GameCorner_B1F_MapBorder:: @ 82FEB50
 	.incbin "data/maps/MossdeepCity_GameCorner_B1F/border.bin"
@@ -4256,13 +4355,14 @@ MossdeepCity_GameCorner_B1F_MapBorder:: @ 82FEB50
 MossdeepCity_GameCorner_B1F_MapBlockdata:: @ 82FEB58
 	.incbin "data/maps/MossdeepCity_GameCorner_B1F/map.bin"
 
+	.align 2
 MossdeepCity_GameCorner_B1F_MapAttributes:: @ 82FEC30
 	.4byte 0xc
 	.4byte 0x9
 	.4byte MossdeepCity_GameCorner_B1F_MapBorder
 	.4byte MossdeepCity_GameCorner_B1F_MapBlockdata
-	.4byte MossdeepCity_GameCorner_B1F_Tileset
-	.4byte MossdeepCity_GameCorner_B1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 SootopolisCity_House1_MapBorder:: @ 82FEC48
 	.incbin "data/maps/SootopolisCity_House1/border.bin"
@@ -4270,6 +4370,7 @@ SootopolisCity_House1_MapBorder:: @ 82FEC48
 SootopolisCity_House1_MapBlockdata:: @ 82FEC50
 	.incbin "data/maps/SootopolisCity_House1/map.bin"
 
+	.align 2
 SootopolisCity_House1_MapAttributes:: @ 82FECC0
 SootopolisCity_House4_MapAttributes:: @ 82FECC0
 SootopolisCity_House7_MapAttributes:: @ 82FECC0
@@ -4277,8 +4378,8 @@ SootopolisCity_House7_MapAttributes:: @ 82FECC0
 	.4byte 0x7
 	.4byte SootopolisCity_House1_MapBorder
 	.4byte SootopolisCity_House1_MapBlockdata
-	.4byte SootopolisCity_House1_Tileset
-	.4byte SootopolisCity_House1_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 SootopolisCity_House2_MapBorder:: @ 82FECD8
 	.incbin "data/maps/SootopolisCity_House2/border.bin"
@@ -4286,14 +4387,15 @@ SootopolisCity_House2_MapBorder:: @ 82FECD8
 SootopolisCity_House2_MapBlockdata:: @ 82FECE0
 	.incbin "data/maps/SootopolisCity_House2/map.bin"
 
+	.align 2
 SootopolisCity_House2_MapAttributes:: @ 82FED50
 SootopolisCity_House5_MapAttributes:: @ 82FED50
 	.4byte 0x8
 	.4byte 0x7
 	.4byte SootopolisCity_House2_MapBorder
 	.4byte SootopolisCity_House2_MapBlockdata
-	.4byte SootopolisCity_House2_Tileset
-	.4byte SootopolisCity_House2_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 SootopolisCity_House3_MapBorder:: @ 82FED68
 	.incbin "data/maps/SootopolisCity_House3/border.bin"
@@ -4301,14 +4403,15 @@ SootopolisCity_House3_MapBorder:: @ 82FED68
 SootopolisCity_House3_MapBlockdata:: @ 82FED70
 	.incbin "data/maps/SootopolisCity_House3/map.bin"
 
+	.align 2
 SootopolisCity_House3_MapAttributes:: @ 82FEDE0
 SootopolisCity_House6_MapAttributes:: @ 82FEDE0
 	.4byte 0x8
 	.4byte 0x7
 	.4byte SootopolisCity_House3_MapBorder
 	.4byte SootopolisCity_House3_MapBlockdata
-	.4byte SootopolisCity_House3_Tileset
-	.4byte SootopolisCity_House3_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 AbandonedShip_HiddenFloorRooms_MapBorder:: @ 82FEDF8
 	.incbin "data/maps/AbandonedShip_HiddenFloorRooms/border.bin"
@@ -4316,13 +4419,14 @@ AbandonedShip_HiddenFloorRooms_MapBorder:: @ 82FEDF8
 AbandonedShip_HiddenFloorRooms_MapBlockdata:: @ 82FEE00
 	.incbin "data/maps/AbandonedShip_HiddenFloorRooms/map.bin"
 
+	.align 2
 AbandonedShip_HiddenFloorRooms_MapAttributes:: @ 82FF328
 	.4byte 0x2c
 	.4byte 0xf
 	.4byte AbandonedShip_HiddenFloorRooms_MapBorder
 	.4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
-	.4byte AbandonedShip_HiddenFloorRooms_Tileset
-	.4byte AbandonedShip_HiddenFloorRooms_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Ship
 
 ScorchedSlab_MapBorder:: @ 82FF340
 	.incbin "data/maps/ScorchedSlab/border.bin"
@@ -4330,13 +4434,14 @@ ScorchedSlab_MapBorder:: @ 82FF340
 ScorchedSlab_MapBlockdata:: @ 82FF348
 	.incbin "data/maps/ScorchedSlab/map.bin"
 
+	.align 2
 ScorchedSlab_MapAttributes:: @ 82FF5A0
 	.4byte 0xf
 	.4byte 0x14
 	.4byte ScorchedSlab_MapBorder
 	.4byte ScorchedSlab_MapBlockdata
-	.4byte ScorchedSlab_Tileset
-	.4byte ScorchedSlab_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 	.incbin "baserom.gba", 0x2ff5b8, 0x2f4
 
@@ -4346,13 +4451,14 @@ RustboroCity_Flat1_1F_MapBorder:: @ 82FF8AC
 RustboroCity_Flat1_1F_MapBlockdata:: @ 82FF8B4
 	.incbin "data/maps/RustboroCity_Flat1_1F/map.bin"
 
+	.align 2
 RustboroCity_Flat1_1F_MapAttributes:: @ 82FF994
 	.4byte 0xe
 	.4byte 0x8
 	.4byte RustboroCity_Flat1_1F_MapBorder
 	.4byte RustboroCity_Flat1_1F_MapBlockdata
-	.4byte RustboroCity_Flat1_1F_Tileset
-	.4byte RustboroCity_Flat1_1F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 RustboroCity_Flat1_2F_MapBorder:: @ 82FF9AC
 	.incbin "data/maps/RustboroCity_Flat1_2F/border.bin"
@@ -4360,13 +4466,14 @@ RustboroCity_Flat1_2F_MapBorder:: @ 82FF9AC
 RustboroCity_Flat1_2F_MapBlockdata:: @ 82FF9B4
 	.incbin "data/maps/RustboroCity_Flat1_2F/map.bin"
 
+	.align 2
 RustboroCity_Flat1_2F_MapAttributes:: @ 82FFA94
 	.4byte 0xe
 	.4byte 0x8
 	.4byte RustboroCity_Flat1_2F_MapBorder
 	.4byte RustboroCity_Flat1_2F_MapBlockdata
-	.4byte RustboroCity_Flat1_2F_Tileset
-	.4byte RustboroCity_Flat1_2F_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 EverGrandeCity_Corridor4_MapBorder:: @ 82FFAAC
 	.incbin "data/maps/EverGrandeCity_Corridor4/border.bin"
@@ -4374,13 +4481,14 @@ EverGrandeCity_Corridor4_MapBorder:: @ 82FFAAC
 EverGrandeCity_Corridor4_MapBlockdata:: @ 82FFAB4
 	.incbin "data/maps/EverGrandeCity_Corridor4/map.bin"
 
+	.align 2
 EverGrandeCity_Corridor4_MapAttributes:: @ 82FFDA0
 	.4byte 0xb
 	.4byte 0x22
 	.4byte EverGrandeCity_Corridor4_MapBorder
 	.4byte EverGrandeCity_Corridor4_MapBlockdata
-	.4byte EverGrandeCity_Corridor4_Tileset
-	.4byte EverGrandeCity_Corridor4_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
 
 MagmaHideout_1F_MapBorder:: @ 82FFDB8
 	.incbin "data/maps/MagmaHideout_1F/border.bin"
@@ -4388,13 +4496,14 @@ MagmaHideout_1F_MapBorder:: @ 82FFDB8
 MagmaHideout_1F_MapBlockdata:: @ 82FFDC0
 	.incbin "data/maps/MagmaHideout_1F/map.bin"
 
+	.align 2
 MagmaHideout_1F_MapAttributes:: @ 8300450
 	.4byte 0x1c
 	.4byte 0x1e
 	.4byte MagmaHideout_1F_MapBorder
 	.4byte MagmaHideout_1F_MapBlockdata
-	.4byte MagmaHideout_1F_Tileset
-	.4byte MagmaHideout_1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 MagmaHideout_B1F_MapBorder:: @ 8300468
 	.incbin "data/maps/MagmaHideout_B1F/border.bin"
@@ -4402,13 +4511,14 @@ MagmaHideout_B1F_MapBorder:: @ 8300468
 MagmaHideout_B1F_MapBlockdata:: @ 8300470
 	.incbin "data/maps/MagmaHideout_B1F/map.bin"
 
+	.align 2
 MagmaHideout_B1F_MapAttributes:: @ 8301010
 	.4byte 0x3e
 	.4byte 0x18
 	.4byte MagmaHideout_B1F_MapBorder
 	.4byte MagmaHideout_B1F_MapBlockdata
-	.4byte MagmaHideout_B1F_Tileset
-	.4byte MagmaHideout_B1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 MagmaHideout_B2F_MapBorder:: @ 8301028
 	.incbin "data/maps/MagmaHideout_B2F/border.bin"
@@ -4416,13 +4526,14 @@ MagmaHideout_B2F_MapBorder:: @ 8301028
 MagmaHideout_B2F_MapBlockdata:: @ 8301030
 	.incbin "data/maps/MagmaHideout_B2F/map.bin"
 
+	.align 2
 MagmaHideout_B2F_MapAttributes:: @ 8301690
 	.4byte 0x22
 	.4byte 0x18
 	.4byte MagmaHideout_B2F_MapBorder
 	.4byte MagmaHideout_B2F_MapBlockdata
-	.4byte MagmaHideout_B2F_Tileset
-	.4byte MagmaHideout_B2F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Facility
 
 	.incbin "baserom.gba", 0x3016a8, 0x12e0
 
@@ -4432,13 +4543,14 @@ SkyPillar_Entrance_MapBorder:: @ 8302988
 SkyPillar_Entrance_MapBlockdata:: @ 8302990
 	.incbin "data/maps/SkyPillar_Entrance/map.bin"
 
+	.align 2
 SkyPillar_Entrance_MapAttributes:: @ 8302C18
 	.4byte 0x12
 	.4byte 0x12
 	.4byte SkyPillar_Entrance_MapBorder
 	.4byte SkyPillar_Entrance_MapBlockdata
-	.4byte SkyPillar_Entrance_Tileset
-	.4byte SkyPillar_Entrance_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 SkyPillar_Outside_MapBorder:: @ 8302C30
 	.incbin "data/maps/SkyPillar_Outside/border.bin"
@@ -4446,13 +4558,14 @@ SkyPillar_Outside_MapBorder:: @ 8302C30
 SkyPillar_Outside_MapBlockdata:: @ 8302C38
 	.incbin "data/maps/SkyPillar_Outside/map.bin"
 
+	.align 2
 SkyPillar_Outside_MapAttributes:: @ 8303140
 	.4byte 0x1c
 	.4byte 0x17
 	.4byte SkyPillar_Outside_MapBorder
 	.4byte SkyPillar_Outside_MapBlockdata
-	.4byte SkyPillar_Outside_Tileset
-	.4byte SkyPillar_Outside_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
 SkyPillar_1F_MapBorder:: @ 8303158
 	.incbin "data/maps/SkyPillar_1F/border.bin"
@@ -4460,13 +4573,14 @@ SkyPillar_1F_MapBorder:: @ 8303158
 SkyPillar_1F_MapBlockdata:: @ 8303160
 	.incbin "data/maps/SkyPillar_1F/map.bin"
 
+	.align 2
 SkyPillar_1F_MapAttributes:: @ 83032E8
 	.4byte 0xe
 	.4byte 0xe
 	.4byte SkyPillar_1F_MapBorder
 	.4byte SkyPillar_1F_MapBlockdata
-	.4byte SkyPillar_1F_Tileset
-	.4byte SkyPillar_1F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
 SkyPillar_2F_MapBorder:: @ 8303300
 	.incbin "data/maps/SkyPillar_2F/border.bin"
@@ -4474,13 +4588,14 @@ SkyPillar_2F_MapBorder:: @ 8303300
 SkyPillar_2F_MapBlockdata:: @ 8303308
 	.incbin "data/maps/SkyPillar_2F/map.bin"
 
+	.align 2
 SkyPillar_2F_MapAttributes:: @ 8303490
 	.4byte 0xe
 	.4byte 0xe
 	.4byte SkyPillar_2F_MapBorder
 	.4byte SkyPillar_2F_MapBlockdata
-	.4byte SkyPillar_2F_Tileset
-	.4byte SkyPillar_2F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
 SkyPillar_3F_MapBorder:: @ 83034A8
 	.incbin "data/maps/SkyPillar_3F/border.bin"
@@ -4488,13 +4603,14 @@ SkyPillar_3F_MapBorder:: @ 83034A8
 SkyPillar_3F_MapBlockdata:: @ 83034B0
 	.incbin "data/maps/SkyPillar_3F/map.bin"
 
+	.align 2
 SkyPillar_3F_MapAttributes:: @ 8303638
 	.4byte 0xe
 	.4byte 0xe
 	.4byte SkyPillar_3F_MapBorder
 	.4byte SkyPillar_3F_MapBlockdata
-	.4byte SkyPillar_3F_Tileset
-	.4byte SkyPillar_3F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
 SkyPillar_4F_MapBorder:: @ 8303650
 	.incbin "data/maps/SkyPillar_4F/border.bin"
@@ -4502,13 +4618,14 @@ SkyPillar_4F_MapBorder:: @ 8303650
 SkyPillar_4F_MapBlockdata:: @ 8303658
 	.incbin "data/maps/SkyPillar_4F/map.bin"
 
+	.align 2
 SkyPillar_4F_MapAttributes:: @ 83037E0
 	.4byte 0xe
 	.4byte 0xe
 	.4byte SkyPillar_4F_MapBorder
 	.4byte SkyPillar_4F_MapBlockdata
-	.4byte SkyPillar_4F_Tileset
-	.4byte SkyPillar_4F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
 	.incbin "baserom.gba", 0x3037f8, 0x9d4
 
@@ -4518,13 +4635,14 @@ MossdeepCity_StevensHouse_MapBorder:: @ 83041CC
 MossdeepCity_StevensHouse_MapBlockdata:: @ 83041D4
 	.incbin "data/maps/MossdeepCity_StevensHouse/map.bin"
 
+	.align 2
 MossdeepCity_StevensHouse_MapAttributes:: @ 8304284
 	.4byte 0xb
 	.4byte 0x8
 	.4byte MossdeepCity_StevensHouse_MapBorder
 	.4byte MossdeepCity_StevensHouse_MapBlockdata
-	.4byte MossdeepCity_StevensHouse_Tileset
-	.4byte MossdeepCity_StevensHouse_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 ShoalCave_LowTideIceRoom_MapBorder:: @ 830429C
 	.incbin "data/maps/ShoalCave_LowTideIceRoom/border.bin"
@@ -4532,13 +4650,14 @@ ShoalCave_LowTideIceRoom_MapBorder:: @ 830429C
 ShoalCave_LowTideIceRoom_MapBlockdata:: @ 83042A4
 	.incbin "data/maps/ShoalCave_LowTideIceRoom/map.bin"
 
+	.align 2
 ShoalCave_LowTideIceRoom_MapAttributes:: @ 8304754
 	.4byte 0x14
 	.4byte 0x1e
 	.4byte ShoalCave_LowTideIceRoom_MapBorder
 	.4byte ShoalCave_LowTideIceRoom_MapBlockdata
-	.4byte ShoalCave_LowTideIceRoom_Tileset
-	.4byte ShoalCave_LowTideIceRoom_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Cave
 
 SafariZone_RestHouse_MapBorder:: @ 830476C
 	.incbin "data/maps/SafariZone_RestHouse/border.bin"
@@ -4546,13 +4665,14 @@ SafariZone_RestHouse_MapBorder:: @ 830476C
 SafariZone_RestHouse_MapBlockdata:: @ 8304774
 	.incbin "data/maps/SafariZone_RestHouse/map.bin"
 
+	.align 2
 SafariZone_RestHouse_MapAttributes:: @ 8304828
 	.4byte 0xa
 	.4byte 0x9
 	.4byte SafariZone_RestHouse_MapBorder
 	.4byte SafariZone_RestHouse_MapBlockdata
-	.4byte SafariZone_RestHouse_Tileset
-	.4byte SafariZone_RestHouse_Tileset2
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
 
 SkyPillar_5F_MapBorder:: @ 8304840
 	.incbin "data/maps/SkyPillar_5F/border.bin"
@@ -4560,13 +4680,14 @@ SkyPillar_5F_MapBorder:: @ 8304840
 SkyPillar_5F_MapBlockdata:: @ 8304848
 	.incbin "data/maps/SkyPillar_5F/map.bin"
 
+	.align 2
 SkyPillar_5F_MapAttributes:: @ 83049D0
 	.4byte 0xe
 	.4byte 0xe
 	.4byte SkyPillar_5F_MapBorder
 	.4byte SkyPillar_5F_MapBlockdata
-	.4byte SkyPillar_5F_Tileset
-	.4byte SkyPillar_5F_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
 SkyPillar_Top_MapBorder:: @ 83049E8
 	.incbin "data/maps/SkyPillar_Top/border.bin"
@@ -4574,11 +4695,12 @@ SkyPillar_Top_MapBorder:: @ 83049E8
 SkyPillar_Top_MapBlockdata:: @ 83049F0
 	.incbin "data/maps/SkyPillar_Top/map.bin"
 
+	.align 2
 SkyPillar_Top_MapAttributes:: @ 8304F00
 	.4byte 0x1b
 	.4byte 0x18
 	.4byte SkyPillar_Top_MapBorder
 	.4byte SkyPillar_Top_MapBlockdata
-	.4byte SkyPillar_Top_Tileset
-	.4byte SkyPillar_Top_Tileset2
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
 
diff --git a/data/maps/scripts/AbandonedShip_CaptainsOffice.s b/data/scripts/maps/AbandonedShip_CaptainsOffice.s
index 5ad17725b..5ad17725b 100644
--- a/data/maps/scripts/AbandonedShip_CaptainsOffice.s
+++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.s
diff --git a/data/maps/scripts/AbandonedShip_Corridors_1F.s b/data/scripts/maps/AbandonedShip_Corridors_1F.s
index 408299ac4..408299ac4 100644
--- a/data/maps/scripts/AbandonedShip_Corridors_1F.s
+++ b/data/scripts/maps/AbandonedShip_Corridors_1F.s
diff --git a/data/maps/scripts/AbandonedShip_Corridors_B1F.s b/data/scripts/maps/AbandonedShip_Corridors_B1F.s
index 71c3691fe..71c3691fe 100644
--- a/data/maps/scripts/AbandonedShip_Corridors_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.s
diff --git a/data/maps/scripts/AbandonedShip_Deck.s b/data/scripts/maps/AbandonedShip_Deck.s
index 605dbae59..605dbae59 100644
--- a/data/maps/scripts/AbandonedShip_Deck.s
+++ b/data/scripts/maps/AbandonedShip_Deck.s
diff --git a/data/maps/scripts/AbandonedShip_HiddenFloorCorridors.s b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s
index 2b1254a11..2b1254a11 100644
--- a/data/maps/scripts/AbandonedShip_HiddenFloorCorridors.s
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.s
diff --git a/data/maps/scripts/AbandonedShip_HiddenFloorRooms.s b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.s
index 8b1e250a6..8b1e250a6 100644
--- a/data/maps/scripts/AbandonedShip_HiddenFloorRooms.s
+++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.s
diff --git a/data/maps/scripts/AbandonedShip_Room_B1F.s b/data/scripts/maps/AbandonedShip_Room_B1F.s
index 92bee6319..92bee6319 100644
--- a/data/maps/scripts/AbandonedShip_Room_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Room_B1F.s
diff --git a/data/maps/scripts/AbandonedShip_Rooms2_1F.s b/data/scripts/maps/AbandonedShip_Rooms2_1F.s
index b059ca4e5..b059ca4e5 100644
--- a/data/maps/scripts/AbandonedShip_Rooms2_1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.s
diff --git a/data/maps/scripts/AbandonedShip_Rooms2_B1F.s b/data/scripts/maps/AbandonedShip_Rooms2_B1F.s
index 18e144a44..18e144a44 100644
--- a/data/maps/scripts/AbandonedShip_Rooms2_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms2_B1F.s
diff --git a/data/maps/scripts/AbandonedShip_Rooms_1F.s b/data/scripts/maps/AbandonedShip_Rooms_1F.s
index dafa5c7bd..dafa5c7bd 100644
--- a/data/maps/scripts/AbandonedShip_Rooms_1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms_1F.s
diff --git a/data/maps/scripts/AbandonedShip_Rooms_B1F.s b/data/scripts/maps/AbandonedShip_Rooms_B1F.s
index cebcf1b77..cebcf1b77 100644
--- a/data/maps/scripts/AbandonedShip_Rooms_B1F.s
+++ b/data/scripts/maps/AbandonedShip_Rooms_B1F.s
diff --git a/data/maps/scripts/AbandonedShip_Underwater1.s b/data/scripts/maps/AbandonedShip_Underwater1.s
index af7a26580..af7a26580 100644
--- a/data/maps/scripts/AbandonedShip_Underwater1.s
+++ b/data/scripts/maps/AbandonedShip_Underwater1.s
diff --git a/data/maps/scripts/AbandonedShip_Underwater2.s b/data/scripts/maps/AbandonedShip_Underwater2.s
index a4f9d3912..a4f9d3912 100644
--- a/data/maps/scripts/AbandonedShip_Underwater2.s
+++ b/data/scripts/maps/AbandonedShip_Underwater2.s
diff --git a/data/maps/scripts/AncientTomb.s b/data/scripts/maps/AncientTomb.s
index 66cf88a9c..66cf88a9c 100644
--- a/data/maps/scripts/AncientTomb.s
+++ b/data/scripts/maps/AncientTomb.s
diff --git a/data/maps/scripts/AquaHideout_1F.s b/data/scripts/maps/AquaHideout_1F.s
index 5a7b04fda..5a7b04fda 100644
--- a/data/maps/scripts/AquaHideout_1F.s
+++ b/data/scripts/maps/AquaHideout_1F.s
diff --git a/data/maps/scripts/AquaHideout_B1F.s b/data/scripts/maps/AquaHideout_B1F.s
index fe37ddda3..fe37ddda3 100644
--- a/data/maps/scripts/AquaHideout_B1F.s
+++ b/data/scripts/maps/AquaHideout_B1F.s
diff --git a/data/maps/scripts/AquaHideout_B2F.s b/data/scripts/maps/AquaHideout_B2F.s
index a0bf90151..a0bf90151 100644
--- a/data/maps/scripts/AquaHideout_B2F.s
+++ b/data/scripts/maps/AquaHideout_B2F.s
diff --git a/data/maps/scripts/BattleTower_BattleRoom.s b/data/scripts/maps/BattleTower_BattleRoom.s
index 76a1a3194..76a1a3194 100644
--- a/data/maps/scripts/BattleTower_BattleRoom.s
+++ b/data/scripts/maps/BattleTower_BattleRoom.s
diff --git a/data/maps/scripts/BattleTower_Corridor.s b/data/scripts/maps/BattleTower_Corridor.s
index 6dd4adb3d..6dd4adb3d 100644
--- a/data/maps/scripts/BattleTower_Corridor.s
+++ b/data/scripts/maps/BattleTower_Corridor.s
diff --git a/data/maps/scripts/BattleTower_Elevator.s b/data/scripts/maps/BattleTower_Elevator.s
index fab5d010d..fab5d010d 100644
--- a/data/maps/scripts/BattleTower_Elevator.s
+++ b/data/scripts/maps/BattleTower_Elevator.s
diff --git a/data/maps/scripts/BattleTower_Lobby.s b/data/scripts/maps/BattleTower_Lobby.s
index a2fd22b10..a2fd22b10 100644
--- a/data/maps/scripts/BattleTower_Lobby.s
+++ b/data/scripts/maps/BattleTower_Lobby.s
diff --git a/data/maps/scripts/BattleTower_Outside.s b/data/scripts/maps/BattleTower_Outside.s
index 4ff10710f..4ff10710f 100644
--- a/data/maps/scripts/BattleTower_Outside.s
+++ b/data/scripts/maps/BattleTower_Outside.s
diff --git a/data/maps/scripts/CaveOfOrigin_1F.s b/data/scripts/maps/CaveOfOrigin_1F.s
index f55cd5081..f55cd5081 100644
--- a/data/maps/scripts/CaveOfOrigin_1F.s
+++ b/data/scripts/maps/CaveOfOrigin_1F.s
diff --git a/data/maps/scripts/CaveOfOrigin_B1F.s b/data/scripts/maps/CaveOfOrigin_B1F.s
index 751f38659..751f38659 100644
--- a/data/maps/scripts/CaveOfOrigin_B1F.s
+++ b/data/scripts/maps/CaveOfOrigin_B1F.s
diff --git a/data/maps/scripts/CaveOfOrigin_B2F.s b/data/scripts/maps/CaveOfOrigin_B2F.s
index 8c1ba56b8..8c1ba56b8 100644
--- a/data/maps/scripts/CaveOfOrigin_B2F.s
+++ b/data/scripts/maps/CaveOfOrigin_B2F.s
diff --git a/data/maps/scripts/CaveOfOrigin_B3F.s b/data/scripts/maps/CaveOfOrigin_B3F.s
index 2ebdb2d05..2ebdb2d05 100644
--- a/data/maps/scripts/CaveOfOrigin_B3F.s
+++ b/data/scripts/maps/CaveOfOrigin_B3F.s
diff --git a/data/maps/scripts/CaveOfOrigin_B4F.s b/data/scripts/maps/CaveOfOrigin_B4F.s
index b0c638df0..b0c638df0 100644
--- a/data/maps/scripts/CaveOfOrigin_B4F.s
+++ b/data/scripts/maps/CaveOfOrigin_B4F.s
diff --git a/data/maps/scripts/CaveOfOrigin_Entrance.s b/data/scripts/maps/CaveOfOrigin_Entrance.s
index a39a290be..a39a290be 100644
--- a/data/maps/scripts/CaveOfOrigin_Entrance.s
+++ b/data/scripts/maps/CaveOfOrigin_Entrance.s
diff --git a/data/maps/scripts/DesertRuins.s b/data/scripts/maps/DesertRuins.s
index de5658eac..de5658eac 100644
--- a/data/maps/scripts/DesertRuins.s
+++ b/data/scripts/maps/DesertRuins.s
diff --git a/data/maps/scripts/DewfordTown.s b/data/scripts/maps/DewfordTown.s
index 6c184198d..6c184198d 100644
--- a/data/maps/scripts/DewfordTown.s
+++ b/data/scripts/maps/DewfordTown.s
diff --git a/data/maps/scripts/DewfordTown_Gym.s b/data/scripts/maps/DewfordTown_Gym.s
index e51c33c69..e51c33c69 100644
--- a/data/maps/scripts/DewfordTown_Gym.s
+++ b/data/scripts/maps/DewfordTown_Gym.s
diff --git a/data/maps/scripts/DewfordTown_Hall.s b/data/scripts/maps/DewfordTown_Hall.s
index a7dd01c32..a7dd01c32 100644
--- a/data/maps/scripts/DewfordTown_Hall.s
+++ b/data/scripts/maps/DewfordTown_Hall.s
diff --git a/data/maps/scripts/DewfordTown_House1.s b/data/scripts/maps/DewfordTown_House1.s
index fa9e62b12..fa9e62b12 100644
--- a/data/maps/scripts/DewfordTown_House1.s
+++ b/data/scripts/maps/DewfordTown_House1.s
diff --git a/data/maps/scripts/DewfordTown_House2.s b/data/scripts/maps/DewfordTown_House2.s
index 8f1e8c784..8f1e8c784 100644
--- a/data/maps/scripts/DewfordTown_House2.s
+++ b/data/scripts/maps/DewfordTown_House2.s
diff --git a/data/maps/scripts/DewfordTown_PokemonCenter_1F.s b/data/scripts/maps/DewfordTown_PokemonCenter_1F.s
index 687a01ddc..687a01ddc 100644
--- a/data/maps/scripts/DewfordTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.s
diff --git a/data/maps/scripts/DewfordTown_PokemonCenter_2F.s b/data/scripts/maps/DewfordTown_PokemonCenter_2F.s
index 5d23f1f9a..5d23f1f9a 100644
--- a/data/maps/scripts/DewfordTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/DewfordTown_PokemonCenter_2F.s
diff --git a/data/maps/scripts/DoubleBattleColosseum.s b/data/scripts/maps/DoubleBattleColosseum.s
index 360f5fced..360f5fced 100644
--- a/data/maps/scripts/DoubleBattleColosseum.s
+++ b/data/scripts/maps/DoubleBattleColosseum.s
diff --git a/data/maps/scripts/EverGrandeCity.s b/data/scripts/maps/EverGrandeCity.s
index cdac6069e..cdac6069e 100644
--- a/data/maps/scripts/EverGrandeCity.s
+++ b/data/scripts/maps/EverGrandeCity.s
diff --git a/data/maps/scripts/EverGrandeCity_ChampionsRoom.s b/data/scripts/maps/EverGrandeCity_ChampionsRoom.s
index de6c091a5..de6c091a5 100644
--- a/data/maps/scripts/EverGrandeCity_ChampionsRoom.s
+++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.s
diff --git a/data/maps/scripts/EverGrandeCity_Corridor1.s b/data/scripts/maps/EverGrandeCity_Corridor1.s
index a3798d99b..a3798d99b 100644
--- a/data/maps/scripts/EverGrandeCity_Corridor1.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor1.s
diff --git a/data/maps/scripts/EverGrandeCity_Corridor2.s b/data/scripts/maps/EverGrandeCity_Corridor2.s
index 699338f21..699338f21 100644
--- a/data/maps/scripts/EverGrandeCity_Corridor2.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor2.s
diff --git a/data/maps/scripts/EverGrandeCity_Corridor3.s b/data/scripts/maps/EverGrandeCity_Corridor3.s
index d70b390a5..d70b390a5 100644
--- a/data/maps/scripts/EverGrandeCity_Corridor3.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor3.s
diff --git a/data/maps/scripts/EverGrandeCity_Corridor4.s b/data/scripts/maps/EverGrandeCity_Corridor4.s
index 131f5d342..131f5d342 100644
--- a/data/maps/scripts/EverGrandeCity_Corridor4.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor4.s
diff --git a/data/maps/scripts/EverGrandeCity_Corridor5.s b/data/scripts/maps/EverGrandeCity_Corridor5.s
index d27df4ec8..d27df4ec8 100644
--- a/data/maps/scripts/EverGrandeCity_Corridor5.s
+++ b/data/scripts/maps/EverGrandeCity_Corridor5.s
diff --git a/data/maps/scripts/EverGrandeCity_DrakesRoom.s b/data/scripts/maps/EverGrandeCity_DrakesRoom.s
index 035566c4e..035566c4e 100644
--- a/data/maps/scripts/EverGrandeCity_DrakesRoom.s
+++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.s
diff --git a/data/maps/scripts/EverGrandeCity_GlaciasRoom.s b/data/scripts/maps/EverGrandeCity_GlaciasRoom.s
index 830a810e6..830a810e6 100644
--- a/data/maps/scripts/EverGrandeCity_GlaciasRoom.s
+++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.s
diff --git a/data/maps/scripts/EverGrandeCity_HallOfFame.s b/data/scripts/maps/EverGrandeCity_HallOfFame.s
index e3d3b74e4..e3d3b74e4 100644
--- a/data/maps/scripts/EverGrandeCity_HallOfFame.s
+++ b/data/scripts/maps/EverGrandeCity_HallOfFame.s
diff --git a/data/maps/scripts/EverGrandeCity_PhoebesRoom.s b/data/scripts/maps/EverGrandeCity_PhoebesRoom.s
index f97a892ce..f97a892ce 100644
--- a/data/maps/scripts/EverGrandeCity_PhoebesRoom.s
+++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.s
diff --git a/data/maps/scripts/EverGrandeCity_PokemonCenter_1F.s b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s
index 85d9e2241..85d9e2241 100644
--- a/data/maps/scripts/EverGrandeCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/EverGrandeCity_PokemonCenter_2F.s b/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s
index 27da0d547..27da0d547 100644
--- a/data/maps/scripts/EverGrandeCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/EverGrandeCity_PokemonLeague.s b/data/scripts/maps/EverGrandeCity_PokemonLeague.s
index e5179022f..e5179022f 100644
--- a/data/maps/scripts/EverGrandeCity_PokemonLeague.s
+++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.s
diff --git a/data/maps/scripts/EverGrandeCity_SidneysRoom.s b/data/scripts/maps/EverGrandeCity_SidneysRoom.s
index 02d8107d7..02d8107d7 100644
--- a/data/maps/scripts/EverGrandeCity_SidneysRoom.s
+++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.s
diff --git a/data/maps/scripts/FallarborTown.s b/data/scripts/maps/FallarborTown.s
index a2e3865c3..a2e3865c3 100644
--- a/data/maps/scripts/FallarborTown.s
+++ b/data/scripts/maps/FallarborTown.s
diff --git a/data/maps/scripts/FallarborTown_ContestHall.s b/data/scripts/maps/FallarborTown_ContestHall.s
index 74deba311..74deba311 100644
--- a/data/maps/scripts/FallarborTown_ContestHall.s
+++ b/data/scripts/maps/FallarborTown_ContestHall.s
diff --git a/data/maps/scripts/FallarborTown_ContestLobby.s b/data/scripts/maps/FallarborTown_ContestLobby.s
index bad7e79d2..bad7e79d2 100644
--- a/data/maps/scripts/FallarborTown_ContestLobby.s
+++ b/data/scripts/maps/FallarborTown_ContestLobby.s
diff --git a/data/maps/scripts/FallarborTown_House1.s b/data/scripts/maps/FallarborTown_House1.s
index 379c17ef9..379c17ef9 100644
--- a/data/maps/scripts/FallarborTown_House1.s
+++ b/data/scripts/maps/FallarborTown_House1.s
diff --git a/data/maps/scripts/FallarborTown_House2.s b/data/scripts/maps/FallarborTown_House2.s
index e63074905..e63074905 100644
--- a/data/maps/scripts/FallarborTown_House2.s
+++ b/data/scripts/maps/FallarborTown_House2.s
diff --git a/data/maps/scripts/FallarborTown_Mart.s b/data/scripts/maps/FallarborTown_Mart.s
index 123128d22..123128d22 100644
--- a/data/maps/scripts/FallarborTown_Mart.s
+++ b/data/scripts/maps/FallarborTown_Mart.s
diff --git a/data/maps/scripts/FallarborTown_PokemonCenter_1F.s b/data/scripts/maps/FallarborTown_PokemonCenter_1F.s
index 04a08eeb3..04a08eeb3 100644
--- a/data/maps/scripts/FallarborTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.s
diff --git a/data/maps/scripts/FallarborTown_PokemonCenter_2F.s b/data/scripts/maps/FallarborTown_PokemonCenter_2F.s
index bc3fb9acb..bc3fb9acb 100644
--- a/data/maps/scripts/FallarborTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/FallarborTown_PokemonCenter_2F.s
diff --git a/data/maps/scripts/FieryPath.s b/data/scripts/maps/FieryPath.s
index d89bd3476..d89bd3476 100644
--- a/data/maps/scripts/FieryPath.s
+++ b/data/scripts/maps/FieryPath.s
diff --git a/data/maps/scripts/FortreeCity.s b/data/scripts/maps/FortreeCity.s
index 96248b265..96248b265 100644
--- a/data/maps/scripts/FortreeCity.s
+++ b/data/scripts/maps/FortreeCity.s
diff --git a/data/maps/scripts/FortreeCity_DecorationShop.s b/data/scripts/maps/FortreeCity_DecorationShop.s
index f006755d4..f006755d4 100644
--- a/data/maps/scripts/FortreeCity_DecorationShop.s
+++ b/data/scripts/maps/FortreeCity_DecorationShop.s
diff --git a/data/maps/scripts/FortreeCity_Gym.s b/data/scripts/maps/FortreeCity_Gym.s
index a9d641f57..a9d641f57 100644
--- a/data/maps/scripts/FortreeCity_Gym.s
+++ b/data/scripts/maps/FortreeCity_Gym.s
diff --git a/data/maps/scripts/FortreeCity_House1.s b/data/scripts/maps/FortreeCity_House1.s
index 827e6cc34..827e6cc34 100644
--- a/data/maps/scripts/FortreeCity_House1.s
+++ b/data/scripts/maps/FortreeCity_House1.s
diff --git a/data/maps/scripts/FortreeCity_House2.s b/data/scripts/maps/FortreeCity_House2.s
index adf190f5c..adf190f5c 100644
--- a/data/maps/scripts/FortreeCity_House2.s
+++ b/data/scripts/maps/FortreeCity_House2.s
diff --git a/data/maps/scripts/FortreeCity_House3.s b/data/scripts/maps/FortreeCity_House3.s
index 99ff44637..99ff44637 100644
--- a/data/maps/scripts/FortreeCity_House3.s
+++ b/data/scripts/maps/FortreeCity_House3.s
diff --git a/data/maps/scripts/FortreeCity_House4.s b/data/scripts/maps/FortreeCity_House4.s
index f48ef1a6d..f48ef1a6d 100644
--- a/data/maps/scripts/FortreeCity_House4.s
+++ b/data/scripts/maps/FortreeCity_House4.s
diff --git a/data/maps/scripts/FortreeCity_House5.s b/data/scripts/maps/FortreeCity_House5.s
index 3c92a619c..3c92a619c 100644
--- a/data/maps/scripts/FortreeCity_House5.s
+++ b/data/scripts/maps/FortreeCity_House5.s
diff --git a/data/maps/scripts/FortreeCity_Mart.s b/data/scripts/maps/FortreeCity_Mart.s
index 6c9cf6298..6c9cf6298 100644
--- a/data/maps/scripts/FortreeCity_Mart.s
+++ b/data/scripts/maps/FortreeCity_Mart.s
diff --git a/data/maps/scripts/FortreeCity_PokemonCenter_1F.s b/data/scripts/maps/FortreeCity_PokemonCenter_1F.s
index d8a8945c9..d8a8945c9 100644
--- a/data/maps/scripts/FortreeCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/FortreeCity_PokemonCenter_2F.s b/data/scripts/maps/FortreeCity_PokemonCenter_2F.s
index 0b63f5670..0b63f5670 100644
--- a/data/maps/scripts/FortreeCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/FortreeCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/GraniteCave_1F.s b/data/scripts/maps/GraniteCave_1F.s
index 5e05f8602..5e05f8602 100644
--- a/data/maps/scripts/GraniteCave_1F.s
+++ b/data/scripts/maps/GraniteCave_1F.s
diff --git a/data/maps/scripts/GraniteCave_B1F.s b/data/scripts/maps/GraniteCave_B1F.s
index 538c58118..538c58118 100644
--- a/data/maps/scripts/GraniteCave_B1F.s
+++ b/data/scripts/maps/GraniteCave_B1F.s
diff --git a/data/maps/scripts/GraniteCave_B2F.s b/data/scripts/maps/GraniteCave_B2F.s
index d28614032..d28614032 100644
--- a/data/maps/scripts/GraniteCave_B2F.s
+++ b/data/scripts/maps/GraniteCave_B2F.s
diff --git a/data/maps/scripts/GraniteCave_StevensRoom.s b/data/scripts/maps/GraniteCave_StevensRoom.s
index 55dccda5f..55dccda5f 100644
--- a/data/maps/scripts/GraniteCave_StevensRoom.s
+++ b/data/scripts/maps/GraniteCave_StevensRoom.s
diff --git a/data/maps/scripts/InsideOfTruck.s b/data/scripts/maps/InsideOfTruck.s
index e411adde2..e411adde2 100644
--- a/data/maps/scripts/InsideOfTruck.s
+++ b/data/scripts/maps/InsideOfTruck.s
diff --git a/data/maps/scripts/IslandCave.s b/data/scripts/maps/IslandCave.s
index 4cad35aab..4cad35aab 100644
--- a/data/maps/scripts/IslandCave.s
+++ b/data/scripts/maps/IslandCave.s
diff --git a/data/maps/scripts/JaggedPass.s b/data/scripts/maps/JaggedPass.s
index a4aa0964b..a4aa0964b 100644
--- a/data/maps/scripts/JaggedPass.s
+++ b/data/scripts/maps/JaggedPass.s
diff --git a/data/maps/scripts/LavaridgeTown.s b/data/scripts/maps/LavaridgeTown.s
index 0f668c584..0f668c584 100644
--- a/data/maps/scripts/LavaridgeTown.s
+++ b/data/scripts/maps/LavaridgeTown.s
diff --git a/data/maps/scripts/LavaridgeTown_Gym_1F.s b/data/scripts/maps/LavaridgeTown_Gym_1F.s
index a44b3cf16..a44b3cf16 100644
--- a/data/maps/scripts/LavaridgeTown_Gym_1F.s
+++ b/data/scripts/maps/LavaridgeTown_Gym_1F.s
diff --git a/data/maps/scripts/LavaridgeTown_Gym_B1F.s b/data/scripts/maps/LavaridgeTown_Gym_B1F.s
index 428c76c49..428c76c49 100644
--- a/data/maps/scripts/LavaridgeTown_Gym_B1F.s
+++ b/data/scripts/maps/LavaridgeTown_Gym_B1F.s
diff --git a/data/maps/scripts/LavaridgeTown_HerbShop.s b/data/scripts/maps/LavaridgeTown_HerbShop.s
index 96d95a75c..96d95a75c 100644
--- a/data/maps/scripts/LavaridgeTown_HerbShop.s
+++ b/data/scripts/maps/LavaridgeTown_HerbShop.s
diff --git a/data/maps/scripts/LavaridgeTown_House.s b/data/scripts/maps/LavaridgeTown_House.s
index 7d5e9bf8b..7d5e9bf8b 100644
--- a/data/maps/scripts/LavaridgeTown_House.s
+++ b/data/scripts/maps/LavaridgeTown_House.s
diff --git a/data/maps/scripts/LavaridgeTown_Mart.s b/data/scripts/maps/LavaridgeTown_Mart.s
index 13e119eeb..13e119eeb 100644
--- a/data/maps/scripts/LavaridgeTown_Mart.s
+++ b/data/scripts/maps/LavaridgeTown_Mart.s
diff --git a/data/maps/scripts/LavaridgeTown_PokemonCenter_1F.s b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s
index 8c17e6d4c..8c17e6d4c 100644
--- a/data/maps/scripts/LavaridgeTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.s
diff --git a/data/maps/scripts/LavaridgeTown_PokemonCenter_2F.s b/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s
index 9b7949ecc..9b7949ecc 100644
--- a/data/maps/scripts/LavaridgeTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.s
diff --git a/data/maps/scripts/LilycoveCity.s b/data/scripts/maps/LilycoveCity.s
index 55e1f2a79..55e1f2a79 100644
--- a/data/maps/scripts/LilycoveCity.s
+++ b/data/scripts/maps/LilycoveCity.s
diff --git a/data/maps/scripts/LilycoveCity_ContestHall.s b/data/scripts/maps/LilycoveCity_ContestHall.s
index a06ccf14d..a06ccf14d 100644
--- a/data/maps/scripts/LilycoveCity_ContestHall.s
+++ b/data/scripts/maps/LilycoveCity_ContestHall.s
diff --git a/data/maps/scripts/LilycoveCity_ContestLobby.s b/data/scripts/maps/LilycoveCity_ContestLobby.s
index f1f1e7925..f1f1e7925 100644
--- a/data/maps/scripts/LilycoveCity_ContestLobby.s
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.s
diff --git a/data/maps/scripts/LilycoveCity_CoveLilyMotel_1F.s b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s
index 95047f532..95047f532 100644
--- a/data/maps/scripts/LilycoveCity_CoveLilyMotel_1F.s
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.s
diff --git a/data/maps/scripts/LilycoveCity_CoveLilyMotel_2F.s b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s
index 5f9c6cd08..5f9c6cd08 100644
--- a/data/maps/scripts/LilycoveCity_CoveLilyMotel_2F.s
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStoreElevator.s b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s
index 1dfacdfbf..1dfacdfbf 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStoreElevator.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStoreRooftop.s b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s
index b98cc38b5..b98cc38b5 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStoreRooftop.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStore_1F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.s
index 8a84101aa..8a84101aa 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStore_1F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStore_2F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s
index f331dc758..f331dc758 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStore_2F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStore_3F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s
index eddabf55f..eddabf55f 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStore_3F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStore_4F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s
index 7466deb99..7466deb99 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStore_4F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.s
diff --git a/data/maps/scripts/LilycoveCity_DepartmentStore_5F.s b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s
index bfe83d6ec..bfe83d6ec 100644
--- a/data/maps/scripts/LilycoveCity_DepartmentStore_5F.s
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.s
diff --git a/data/maps/scripts/LilycoveCity_EmptyMap.s b/data/scripts/maps/LilycoveCity_EmptyMap.s
index 25ecb3866..25ecb3866 100644
--- a/data/maps/scripts/LilycoveCity_EmptyMap.s
+++ b/data/scripts/maps/LilycoveCity_EmptyMap.s
diff --git a/data/maps/scripts/LilycoveCity_Harbor.s b/data/scripts/maps/LilycoveCity_Harbor.s
index 6195332a1..6195332a1 100644
--- a/data/maps/scripts/LilycoveCity_Harbor.s
+++ b/data/scripts/maps/LilycoveCity_Harbor.s
diff --git a/data/maps/scripts/LilycoveCity_House1.s b/data/scripts/maps/LilycoveCity_House1.s
index 28a4532b1..28a4532b1 100644
--- a/data/maps/scripts/LilycoveCity_House1.s
+++ b/data/scripts/maps/LilycoveCity_House1.s
diff --git a/data/maps/scripts/LilycoveCity_House2.s b/data/scripts/maps/LilycoveCity_House2.s
index c1fe01b46..c1fe01b46 100644
--- a/data/maps/scripts/LilycoveCity_House2.s
+++ b/data/scripts/maps/LilycoveCity_House2.s
diff --git a/data/maps/scripts/LilycoveCity_House3.s b/data/scripts/maps/LilycoveCity_House3.s
index 5c4eaac9d..5c4eaac9d 100644
--- a/data/maps/scripts/LilycoveCity_House3.s
+++ b/data/scripts/maps/LilycoveCity_House3.s
diff --git a/data/maps/scripts/LilycoveCity_House4.s b/data/scripts/maps/LilycoveCity_House4.s
index 98d8ca9a4..98d8ca9a4 100644
--- a/data/maps/scripts/LilycoveCity_House4.s
+++ b/data/scripts/maps/LilycoveCity_House4.s
diff --git a/data/maps/scripts/LilycoveCity_LilycoveMuseum_1F.s b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s
index 9975419d0..9975419d0 100644
--- a/data/maps/scripts/LilycoveCity_LilycoveMuseum_1F.s
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.s
diff --git a/data/maps/scripts/LilycoveCity_LilycoveMuseum_2F.s b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s
index 44015d256..44015d256 100644
--- a/data/maps/scripts/LilycoveCity_LilycoveMuseum_2F.s
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.s
diff --git a/data/maps/scripts/LilycoveCity_MoveDeletersHouse.s b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.s
index cd6f648a4..cd6f648a4 100644
--- a/data/maps/scripts/LilycoveCity_MoveDeletersHouse.s
+++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.s
diff --git a/data/maps/scripts/LilycoveCity_PokemonCenter_1F.s b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.s
index d34bd0b84..d34bd0b84 100644
--- a/data/maps/scripts/LilycoveCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/LilycoveCity_PokemonCenter_2F.s b/data/scripts/maps/LilycoveCity_PokemonCenter_2F.s
index ee60cf2ca..ee60cf2ca 100644
--- a/data/maps/scripts/LilycoveCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/LilycoveCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/LilycoveCity_PokemonTrainerFanClub.s b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s
index c76acaff4..c76acaff4 100644
--- a/data/maps/scripts/LilycoveCity_PokemonTrainerFanClub.s
+++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.s
diff --git a/data/maps/scripts/LilycoveCity_UnusedMart.s b/data/scripts/maps/LilycoveCity_UnusedMart.s
index edfd32b4a..edfd32b4a 100644
--- a/data/maps/scripts/LilycoveCity_UnusedMart.s
+++ b/data/scripts/maps/LilycoveCity_UnusedMart.s
diff --git a/data/maps/scripts/LinkContestRoom1.s b/data/scripts/maps/LinkContestRoom1.s
index 2709f558c..2709f558c 100644
--- a/data/maps/scripts/LinkContestRoom1.s
+++ b/data/scripts/maps/LinkContestRoom1.s
diff --git a/data/maps/scripts/LinkContestRoom2.s b/data/scripts/maps/LinkContestRoom2.s
index f61e3fae6..f61e3fae6 100644
--- a/data/maps/scripts/LinkContestRoom2.s
+++ b/data/scripts/maps/LinkContestRoom2.s
diff --git a/data/maps/scripts/LinkContestRoom3.s b/data/scripts/maps/LinkContestRoom3.s
index 5a34f848a..5a34f848a 100644
--- a/data/maps/scripts/LinkContestRoom3.s
+++ b/data/scripts/maps/LinkContestRoom3.s
diff --git a/data/maps/scripts/LinkContestRoom4.s b/data/scripts/maps/LinkContestRoom4.s
index bf6539bdd..bf6539bdd 100644
--- a/data/maps/scripts/LinkContestRoom4.s
+++ b/data/scripts/maps/LinkContestRoom4.s
diff --git a/data/maps/scripts/LinkContestRoom5.s b/data/scripts/maps/LinkContestRoom5.s
index d3cd5d64b..d3cd5d64b 100644
--- a/data/maps/scripts/LinkContestRoom5.s
+++ b/data/scripts/maps/LinkContestRoom5.s
diff --git a/data/maps/scripts/LinkContestRoom6.s b/data/scripts/maps/LinkContestRoom6.s
index 26296ece6..26296ece6 100644
--- a/data/maps/scripts/LinkContestRoom6.s
+++ b/data/scripts/maps/LinkContestRoom6.s
diff --git a/data/maps/scripts/LittlerootTown.s b/data/scripts/maps/LittlerootTown.s
index 600218ebf..600218ebf 100644
--- a/data/maps/scripts/LittlerootTown.s
+++ b/data/scripts/maps/LittlerootTown.s
diff --git a/data/maps/scripts/LittlerootTown_BrendansHouse_1F.s b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.s
index 78a10f6e6..78a10f6e6 100644
--- a/data/maps/scripts/LittlerootTown_BrendansHouse_1F.s
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.s
diff --git a/data/maps/scripts/LittlerootTown_BrendansHouse_2F.s b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.s
index e22ae74ca..39f4d3bae 100644
--- a/data/maps/scripts/LittlerootTown_BrendansHouse_2F.s
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.s
@@ -53,7 +53,6 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837
 
 	.global gUnknown_08152850
 gUnknown_08152850: @ 8152850
-
 	.incbin "baserom.gba", 0x152850, 0xd
 
 LittlerootTown_BrendansHouse_2F_EventScript_15285D:: @ 815285D
@@ -70,85 +69,3 @@ LittlerootTown_BrendansHouse_2F_EventScript_152870:: @ 8152870
 LittlerootTown_MaysHouse_2F_EventScript_152870:: @ 8152870
 	msgbox LittlerootTown_BrendansHouse_2F_Text_17306C, 3
 	end
-
-	.include "data/maps/scripts/LittlerootTown_MaysHouse_1F.s"
-	.include "data/maps/scripts/LittlerootTown_MaysHouse_2F.s"
-LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_13
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_13
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_13
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_13
-	step_end
-
-	.global gUnknown_08152C39
-gUnknown_08152C39: @ 8152C39
-
-LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39
-	lockall
-	checkgender
-	compare RESULT, 0
-	jumpeq LittlerootTown_MaysHouse_2F_EventScript_152C52
-	compare RESULT, 1
-	jumpeq LittlerootTown_MaysHouse_2F_EventScript_152C5C
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52
-	msgbox LittlerootTown_MaysHouse_2F_Text_1A100C, 4
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C
-	setvar 0x8004, 2
-	special 214
-	playsfx 4
-	msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4
-	special 249
-	waitstate
-	releaseall
-	end
-
-	.global gUnknown_08152C75
-gUnknown_08152C75: @ 8152C75
-
-	.incbin "baserom.gba", 0x152c75, 0xd
diff --git a/data/maps/scripts/LittlerootTown_MaysHouse_1F.s b/data/scripts/maps/LittlerootTown_MaysHouse_1F.s
index baf6df5af..baf6df5af 100644
--- a/data/maps/scripts/LittlerootTown_MaysHouse_1F.s
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.s
diff --git a/data/maps/scripts/LittlerootTown_MaysHouse_2F.s b/data/scripts/maps/LittlerootTown_MaysHouse_2F.s
index 34a7752fa..b09cd4011 100644
--- a/data/maps/scripts/LittlerootTown_MaysHouse_2F.s
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.s
@@ -141,3 +141,81 @@ LittlerootTown_BrendansHouse_2F_EventScript_152C08:: @ 8152C08
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1739CC, 4
 	return
 
+LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11
+	step_down
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_up
+	step_up
+	step_13
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_left
+	step_up
+	step_13
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25
+	step_down
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_up
+	step_13
+	step_end
+
+LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_right
+	step_up
+	step_13
+	step_end
+
+	.global gUnknown_08152C39
+gUnknown_08152C39: @ 8152C39
+
+LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39
+	lockall
+	checkgender
+	compare RESULT, 0
+	jumpeq LittlerootTown_MaysHouse_2F_EventScript_152C52
+	compare RESULT, 1
+	jumpeq LittlerootTown_MaysHouse_2F_EventScript_152C5C
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52
+	msgbox LittlerootTown_MaysHouse_2F_Text_1A100C, 4
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C
+	setvar 0x8004, 2
+	special 214
+	playsfx 4
+	msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4
+	special 249
+	waitstate
+	releaseall
+	end
+
+	.global gUnknown_08152C75
+gUnknown_08152C75: @ 8152C75
+	.incbin "baserom.gba", 0x152c75, 0xd
diff --git a/data/maps/scripts/LittlerootTown_ProfessorBirchsLab.s b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s
index 81bb270fc..81bb270fc 100644
--- a/data/maps/scripts/LittlerootTown_ProfessorBirchsLab.s
+++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.s
diff --git a/data/maps/scripts/MagmaHideout_1F.s b/data/scripts/maps/MagmaHideout_1F.s
index c58248c10..c58248c10 100644
--- a/data/maps/scripts/MagmaHideout_1F.s
+++ b/data/scripts/maps/MagmaHideout_1F.s
diff --git a/data/maps/scripts/MagmaHideout_B1F.s b/data/scripts/maps/MagmaHideout_B1F.s
index ca2d6f773..ca2d6f773 100644
--- a/data/maps/scripts/MagmaHideout_B1F.s
+++ b/data/scripts/maps/MagmaHideout_B1F.s
diff --git a/data/maps/scripts/MagmaHideout_B2F.s b/data/scripts/maps/MagmaHideout_B2F.s
index 09b6659c3..09b6659c3 100644
--- a/data/maps/scripts/MagmaHideout_B2F.s
+++ b/data/scripts/maps/MagmaHideout_B2F.s
diff --git a/data/maps/scripts/MauvilleCity.s b/data/scripts/maps/MauvilleCity.s
index 229b6143c..229b6143c 100644
--- a/data/maps/scripts/MauvilleCity.s
+++ b/data/scripts/maps/MauvilleCity.s
diff --git a/data/maps/scripts/MauvilleCity_BikeShop.s b/data/scripts/maps/MauvilleCity_BikeShop.s
index 9d9293365..9d9293365 100644
--- a/data/maps/scripts/MauvilleCity_BikeShop.s
+++ b/data/scripts/maps/MauvilleCity_BikeShop.s
diff --git a/data/maps/scripts/MauvilleCity_GameCorner.s b/data/scripts/maps/MauvilleCity_GameCorner.s
index a77e099c5..a77e099c5 100644
--- a/data/maps/scripts/MauvilleCity_GameCorner.s
+++ b/data/scripts/maps/MauvilleCity_GameCorner.s
diff --git a/data/maps/scripts/MauvilleCity_Gym.s b/data/scripts/maps/MauvilleCity_Gym.s
index bbae24bf3..bbae24bf3 100644
--- a/data/maps/scripts/MauvilleCity_Gym.s
+++ b/data/scripts/maps/MauvilleCity_Gym.s
diff --git a/data/maps/scripts/MauvilleCity_House1.s b/data/scripts/maps/MauvilleCity_House1.s
index e1ae389bb..e1ae389bb 100644
--- a/data/maps/scripts/MauvilleCity_House1.s
+++ b/data/scripts/maps/MauvilleCity_House1.s
diff --git a/data/maps/scripts/MauvilleCity_House2.s b/data/scripts/maps/MauvilleCity_House2.s
index 65e7c0e3e..65e7c0e3e 100644
--- a/data/maps/scripts/MauvilleCity_House2.s
+++ b/data/scripts/maps/MauvilleCity_House2.s
diff --git a/data/maps/scripts/MauvilleCity_Mart.s b/data/scripts/maps/MauvilleCity_Mart.s
index 312b64226..312b64226 100644
--- a/data/maps/scripts/MauvilleCity_Mart.s
+++ b/data/scripts/maps/MauvilleCity_Mart.s
diff --git a/data/maps/scripts/MauvilleCity_PokemonCenter_1F.s b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.s
index 6a1582145..6a1582145 100644
--- a/data/maps/scripts/MauvilleCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/MauvilleCity_PokemonCenter_2F.s b/data/scripts/maps/MauvilleCity_PokemonCenter_2F.s
index e888ecc6e..e888ecc6e 100644
--- a/data/maps/scripts/MauvilleCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/MauvilleCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/MeteorFalls_1F_1R.s b/data/scripts/maps/MeteorFalls_1F_1R.s
index 7574a9b4b..7574a9b4b 100644
--- a/data/maps/scripts/MeteorFalls_1F_1R.s
+++ b/data/scripts/maps/MeteorFalls_1F_1R.s
diff --git a/data/maps/scripts/MeteorFalls_1F_2R.s b/data/scripts/maps/MeteorFalls_1F_2R.s
index ffd6f619c..ffd6f619c 100644
--- a/data/maps/scripts/MeteorFalls_1F_2R.s
+++ b/data/scripts/maps/MeteorFalls_1F_2R.s
diff --git a/data/maps/scripts/MeteorFalls_B1F_1R.s b/data/scripts/maps/MeteorFalls_B1F_1R.s
index 024cf305e..024cf305e 100644
--- a/data/maps/scripts/MeteorFalls_B1F_1R.s
+++ b/data/scripts/maps/MeteorFalls_B1F_1R.s
diff --git a/data/maps/scripts/MeteorFalls_B1F_2R.s b/data/scripts/maps/MeteorFalls_B1F_2R.s
index 1f1f6ee99..1f1f6ee99 100644
--- a/data/maps/scripts/MeteorFalls_B1F_2R.s
+++ b/data/scripts/maps/MeteorFalls_B1F_2R.s
diff --git a/data/maps/scripts/MossdeepCity.s b/data/scripts/maps/MossdeepCity.s
index 70adb2f9d..70adb2f9d 100644
--- a/data/maps/scripts/MossdeepCity.s
+++ b/data/scripts/maps/MossdeepCity.s
diff --git a/data/maps/scripts/MossdeepCity_GameCorner_1F.s b/data/scripts/maps/MossdeepCity_GameCorner_1F.s
index 573e69d8e..573e69d8e 100644
--- a/data/maps/scripts/MossdeepCity_GameCorner_1F.s
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.s
diff --git a/data/maps/scripts/MossdeepCity_GameCorner_B1F.s b/data/scripts/maps/MossdeepCity_GameCorner_B1F.s
index 3fa9fe707..3fa9fe707 100644
--- a/data/maps/scripts/MossdeepCity_GameCorner_B1F.s
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.s
diff --git a/data/maps/scripts/MossdeepCity_Gym.s b/data/scripts/maps/MossdeepCity_Gym.s
index a28f6043a..a28f6043a 100644
--- a/data/maps/scripts/MossdeepCity_Gym.s
+++ b/data/scripts/maps/MossdeepCity_Gym.s
diff --git a/data/maps/scripts/MossdeepCity_House1.s b/data/scripts/maps/MossdeepCity_House1.s
index 607ca1baa..607ca1baa 100644
--- a/data/maps/scripts/MossdeepCity_House1.s
+++ b/data/scripts/maps/MossdeepCity_House1.s
diff --git a/data/maps/scripts/MossdeepCity_House2.s b/data/scripts/maps/MossdeepCity_House2.s
index 99aa63f91..99aa63f91 100644
--- a/data/maps/scripts/MossdeepCity_House2.s
+++ b/data/scripts/maps/MossdeepCity_House2.s
diff --git a/data/maps/scripts/MossdeepCity_House3.s b/data/scripts/maps/MossdeepCity_House3.s
index 9401bf58e..9401bf58e 100644
--- a/data/maps/scripts/MossdeepCity_House3.s
+++ b/data/scripts/maps/MossdeepCity_House3.s
diff --git a/data/maps/scripts/MossdeepCity_House4.s b/data/scripts/maps/MossdeepCity_House4.s
index 3fde63469..3fde63469 100644
--- a/data/maps/scripts/MossdeepCity_House4.s
+++ b/data/scripts/maps/MossdeepCity_House4.s
diff --git a/data/maps/scripts/MossdeepCity_Mart.s b/data/scripts/maps/MossdeepCity_Mart.s
index ef20523a8..ef20523a8 100644
--- a/data/maps/scripts/MossdeepCity_Mart.s
+++ b/data/scripts/maps/MossdeepCity_Mart.s
diff --git a/data/maps/scripts/MossdeepCity_PokemonCenter_1F.s b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.s
index 4ac89863a..4ac89863a 100644
--- a/data/maps/scripts/MossdeepCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/MossdeepCity_PokemonCenter_2F.s b/data/scripts/maps/MossdeepCity_PokemonCenter_2F.s
index 09aca3dae..09aca3dae 100644
--- a/data/maps/scripts/MossdeepCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/MossdeepCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/MossdeepCity_SpaceCenter_1F.s b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.s
index 460281ebb..460281ebb 100644
--- a/data/maps/scripts/MossdeepCity_SpaceCenter_1F.s
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.s
diff --git a/data/maps/scripts/MossdeepCity_SpaceCenter_2F.s b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.s
index 145cae073..145cae073 100644
--- a/data/maps/scripts/MossdeepCity_SpaceCenter_2F.s
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.s
diff --git a/data/maps/scripts/MossdeepCity_StevensHouse.s b/data/scripts/maps/MossdeepCity_StevensHouse.s
index 69e0fbffd..69e0fbffd 100644
--- a/data/maps/scripts/MossdeepCity_StevensHouse.s
+++ b/data/scripts/maps/MossdeepCity_StevensHouse.s
diff --git a/data/maps/scripts/MtChimney.s b/data/scripts/maps/MtChimney.s
index 8c7db64be..8c7db64be 100644
--- a/data/maps/scripts/MtChimney.s
+++ b/data/scripts/maps/MtChimney.s
diff --git a/data/maps/scripts/MtChimney_CableCarStation.s b/data/scripts/maps/MtChimney_CableCarStation.s
index 2f916a554..2f916a554 100644
--- a/data/maps/scripts/MtChimney_CableCarStation.s
+++ b/data/scripts/maps/MtChimney_CableCarStation.s
diff --git a/data/maps/scripts/MtPyre_1F.s b/data/scripts/maps/MtPyre_1F.s
index cc9ff3cba..cc9ff3cba 100644
--- a/data/maps/scripts/MtPyre_1F.s
+++ b/data/scripts/maps/MtPyre_1F.s
diff --git a/data/maps/scripts/MtPyre_2F.s b/data/scripts/maps/MtPyre_2F.s
index f01d63528..f01d63528 100644
--- a/data/maps/scripts/MtPyre_2F.s
+++ b/data/scripts/maps/MtPyre_2F.s
diff --git a/data/maps/scripts/MtPyre_3F.s b/data/scripts/maps/MtPyre_3F.s
index 2d571a99a..2d571a99a 100644
--- a/data/maps/scripts/MtPyre_3F.s
+++ b/data/scripts/maps/MtPyre_3F.s
diff --git a/data/maps/scripts/MtPyre_4F.s b/data/scripts/maps/MtPyre_4F.s
index 34fd8db92..34fd8db92 100644
--- a/data/maps/scripts/MtPyre_4F.s
+++ b/data/scripts/maps/MtPyre_4F.s
diff --git a/data/maps/scripts/MtPyre_5F.s b/data/scripts/maps/MtPyre_5F.s
index 2495a4c9a..2495a4c9a 100644
--- a/data/maps/scripts/MtPyre_5F.s
+++ b/data/scripts/maps/MtPyre_5F.s
diff --git a/data/maps/scripts/MtPyre_6F.s b/data/scripts/maps/MtPyre_6F.s
index 90b9ac2be..90b9ac2be 100644
--- a/data/maps/scripts/MtPyre_6F.s
+++ b/data/scripts/maps/MtPyre_6F.s
diff --git a/data/maps/scripts/MtPyre_Exterior.s b/data/scripts/maps/MtPyre_Exterior.s
index 0cd44ed2b..0cd44ed2b 100644
--- a/data/maps/scripts/MtPyre_Exterior.s
+++ b/data/scripts/maps/MtPyre_Exterior.s
diff --git a/data/maps/scripts/MtPyre_Summit.s b/data/scripts/maps/MtPyre_Summit.s
index 41ffa235a..41ffa235a 100644
--- a/data/maps/scripts/MtPyre_Summit.s
+++ b/data/scripts/maps/MtPyre_Summit.s
diff --git a/data/maps/scripts/NewMauville_Entrance.s b/data/scripts/maps/NewMauville_Entrance.s
index 3683aea5b..3683aea5b 100644
--- a/data/maps/scripts/NewMauville_Entrance.s
+++ b/data/scripts/maps/NewMauville_Entrance.s
diff --git a/data/maps/scripts/NewMauville_Inside.s b/data/scripts/maps/NewMauville_Inside.s
index 7111ab770..7111ab770 100644
--- a/data/maps/scripts/NewMauville_Inside.s
+++ b/data/scripts/maps/NewMauville_Inside.s
diff --git a/data/maps/scripts/OldaleTown.s b/data/scripts/maps/OldaleTown.s
index 4595cd5c0..4595cd5c0 100644
--- a/data/maps/scripts/OldaleTown.s
+++ b/data/scripts/maps/OldaleTown.s
diff --git a/data/maps/scripts/OldaleTown_House1.s b/data/scripts/maps/OldaleTown_House1.s
index 033980c01..033980c01 100644
--- a/data/maps/scripts/OldaleTown_House1.s
+++ b/data/scripts/maps/OldaleTown_House1.s
diff --git a/data/maps/scripts/OldaleTown_House2.s b/data/scripts/maps/OldaleTown_House2.s
index 3cdcc49db..3cdcc49db 100644
--- a/data/maps/scripts/OldaleTown_House2.s
+++ b/data/scripts/maps/OldaleTown_House2.s
diff --git a/data/maps/scripts/OldaleTown_Mart.s b/data/scripts/maps/OldaleTown_Mart.s
index d4c76f516..d4c76f516 100644
--- a/data/maps/scripts/OldaleTown_Mart.s
+++ b/data/scripts/maps/OldaleTown_Mart.s
diff --git a/data/maps/scripts/OldaleTown_PokemonCenter_1F.s b/data/scripts/maps/OldaleTown_PokemonCenter_1F.s
index c9abc12a7..c9abc12a7 100644
--- a/data/maps/scripts/OldaleTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.s
diff --git a/data/maps/scripts/OldaleTown_PokemonCenter_2F.s b/data/scripts/maps/OldaleTown_PokemonCenter_2F.s
index bab0f21af..bab0f21af 100644
--- a/data/maps/scripts/OldaleTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/OldaleTown_PokemonCenter_2F.s
diff --git a/data/maps/scripts/PacifidlogTown.s b/data/scripts/maps/PacifidlogTown.s
index f1c6ed462..f1c6ed462 100644
--- a/data/maps/scripts/PacifidlogTown.s
+++ b/data/scripts/maps/PacifidlogTown.s
diff --git a/data/maps/scripts/PacifidlogTown_House1.s b/data/scripts/maps/PacifidlogTown_House1.s
index e7ad13f31..e7ad13f31 100644
--- a/data/maps/scripts/PacifidlogTown_House1.s
+++ b/data/scripts/maps/PacifidlogTown_House1.s
diff --git a/data/maps/scripts/PacifidlogTown_House2.s b/data/scripts/maps/PacifidlogTown_House2.s
index 5348a273d..5348a273d 100644
--- a/data/maps/scripts/PacifidlogTown_House2.s
+++ b/data/scripts/maps/PacifidlogTown_House2.s
diff --git a/data/maps/scripts/PacifidlogTown_House3.s b/data/scripts/maps/PacifidlogTown_House3.s
index 4dfc1fa92..4dfc1fa92 100644
--- a/data/maps/scripts/PacifidlogTown_House3.s
+++ b/data/scripts/maps/PacifidlogTown_House3.s
diff --git a/data/maps/scripts/PacifidlogTown_House4.s b/data/scripts/maps/PacifidlogTown_House4.s
index 1df583033..1df583033 100644
--- a/data/maps/scripts/PacifidlogTown_House4.s
+++ b/data/scripts/maps/PacifidlogTown_House4.s
diff --git a/data/maps/scripts/PacifidlogTown_House5.s b/data/scripts/maps/PacifidlogTown_House5.s
index 0aace4265..0aace4265 100644
--- a/data/maps/scripts/PacifidlogTown_House5.s
+++ b/data/scripts/maps/PacifidlogTown_House5.s
diff --git a/data/maps/scripts/PacifidlogTown_PokemonCenter_1F.s b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s
index 6fa955c34..6fa955c34 100644
--- a/data/maps/scripts/PacifidlogTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.s
diff --git a/data/maps/scripts/PacifidlogTown_PokemonCenter_2F.s b/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s
index 026119917..026119917 100644
--- a/data/maps/scripts/PacifidlogTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.s
diff --git a/data/maps/scripts/PetalburgCity.s b/data/scripts/maps/PetalburgCity.s
index d82359af1..d82359af1 100644
--- a/data/maps/scripts/PetalburgCity.s
+++ b/data/scripts/maps/PetalburgCity.s
diff --git a/data/maps/scripts/PetalburgCity_Gym.s b/data/scripts/maps/PetalburgCity_Gym.s
index c9e54f6cf..c9e54f6cf 100644
--- a/data/maps/scripts/PetalburgCity_Gym.s
+++ b/data/scripts/maps/PetalburgCity_Gym.s
diff --git a/data/maps/scripts/PetalburgCity_House1.s b/data/scripts/maps/PetalburgCity_House1.s
index 3950e1259..3950e1259 100644
--- a/data/maps/scripts/PetalburgCity_House1.s
+++ b/data/scripts/maps/PetalburgCity_House1.s
diff --git a/data/maps/scripts/PetalburgCity_House2.s b/data/scripts/maps/PetalburgCity_House2.s
index fbd3f9b0d..fbd3f9b0d 100644
--- a/data/maps/scripts/PetalburgCity_House2.s
+++ b/data/scripts/maps/PetalburgCity_House2.s
diff --git a/data/maps/scripts/PetalburgCity_Mart.s b/data/scripts/maps/PetalburgCity_Mart.s
index 85fc92110..85fc92110 100644
--- a/data/maps/scripts/PetalburgCity_Mart.s
+++ b/data/scripts/maps/PetalburgCity_Mart.s
diff --git a/data/maps/scripts/PetalburgCity_PokemonCenter_1F.s b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.s
index faf7b8792..faf7b8792 100644
--- a/data/maps/scripts/PetalburgCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/PetalburgCity_PokemonCenter_2F.s b/data/scripts/maps/PetalburgCity_PokemonCenter_2F.s
index e26624dd6..e26624dd6 100644
--- a/data/maps/scripts/PetalburgCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/PetalburgCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/PetalburgCity_WallysHouse.s b/data/scripts/maps/PetalburgCity_WallysHouse.s
index 724e0da6f..724e0da6f 100644
--- a/data/maps/scripts/PetalburgCity_WallysHouse.s
+++ b/data/scripts/maps/PetalburgCity_WallysHouse.s
diff --git a/data/maps/scripts/PetalburgWoods.s b/data/scripts/maps/PetalburgWoods.s
index 4642642a4..4642642a4 100644
--- a/data/maps/scripts/PetalburgWoods.s
+++ b/data/scripts/maps/PetalburgWoods.s
diff --git a/data/maps/scripts/RecordCorner.s b/data/scripts/maps/RecordCorner.s
index 60ea39284..60ea39284 100644
--- a/data/maps/scripts/RecordCorner.s
+++ b/data/scripts/maps/RecordCorner.s
diff --git a/data/maps/scripts/Route101.s b/data/scripts/maps/Route101.s
index a44d0ffd3..a44d0ffd3 100644
--- a/data/maps/scripts/Route101.s
+++ b/data/scripts/maps/Route101.s
diff --git a/data/maps/scripts/Route102.s b/data/scripts/maps/Route102.s
index 09ce6f806..09ce6f806 100644
--- a/data/maps/scripts/Route102.s
+++ b/data/scripts/maps/Route102.s
diff --git a/data/maps/scripts/Route103.s b/data/scripts/maps/Route103.s
index ad745ea37..ad745ea37 100644
--- a/data/maps/scripts/Route103.s
+++ b/data/scripts/maps/Route103.s
diff --git a/data/maps/scripts/Route104.s b/data/scripts/maps/Route104.s
index 624646d34..624646d34 100644
--- a/data/maps/scripts/Route104.s
+++ b/data/scripts/maps/Route104.s
diff --git a/data/maps/scripts/Route104_MrBrineysHouse.s b/data/scripts/maps/Route104_MrBrineysHouse.s
index 592e58ce8..592e58ce8 100644
--- a/data/maps/scripts/Route104_MrBrineysHouse.s
+++ b/data/scripts/maps/Route104_MrBrineysHouse.s
diff --git a/data/maps/scripts/Route104_PrettyPetalFlowerShop.s b/data/scripts/maps/Route104_PrettyPetalFlowerShop.s
index 18c4f85b7..18c4f85b7 100644
--- a/data/maps/scripts/Route104_PrettyPetalFlowerShop.s
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.s
diff --git a/data/maps/scripts/Route104_Prototype.s b/data/scripts/maps/Route104_Prototype.s
index 71022f23f..71022f23f 100644
--- a/data/maps/scripts/Route104_Prototype.s
+++ b/data/scripts/maps/Route104_Prototype.s
diff --git a/data/maps/scripts/Route104_PrototypePrettyPetalFlowerShop.s b/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s
index ce5355d8a..ce5355d8a 100644
--- a/data/maps/scripts/Route104_PrototypePrettyPetalFlowerShop.s
+++ b/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.s
diff --git a/data/maps/scripts/Route105.s b/data/scripts/maps/Route105.s
index 391b31e34..391b31e34 100644
--- a/data/maps/scripts/Route105.s
+++ b/data/scripts/maps/Route105.s
diff --git a/data/maps/scripts/Route106.s b/data/scripts/maps/Route106.s
index c7c9820cd..c7c9820cd 100644
--- a/data/maps/scripts/Route106.s
+++ b/data/scripts/maps/Route106.s
diff --git a/data/maps/scripts/Route107.s b/data/scripts/maps/Route107.s
index c50eec6a1..c50eec6a1 100644
--- a/data/maps/scripts/Route107.s
+++ b/data/scripts/maps/Route107.s
diff --git a/data/maps/scripts/Route108.s b/data/scripts/maps/Route108.s
index 70a852195..70a852195 100644
--- a/data/maps/scripts/Route108.s
+++ b/data/scripts/maps/Route108.s
diff --git a/data/maps/scripts/Route109.s b/data/scripts/maps/Route109.s
index 39def243c..39def243c 100644
--- a/data/maps/scripts/Route109.s
+++ b/data/scripts/maps/Route109.s
diff --git a/data/maps/scripts/Route109_SeashoreHouse.s b/data/scripts/maps/Route109_SeashoreHouse.s
index aa9d55919..aa9d55919 100644
--- a/data/maps/scripts/Route109_SeashoreHouse.s
+++ b/data/scripts/maps/Route109_SeashoreHouse.s
diff --git a/data/maps/scripts/Route110.s b/data/scripts/maps/Route110.s
index 53b2c8172..53b2c8172 100644
--- a/data/maps/scripts/Route110.s
+++ b/data/scripts/maps/Route110.s
diff --git a/data/maps/scripts/Route110_SeasideCyclingRoadNorthEntrance.s b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s
index ed5dd3cda..ed5dd3cda 100644
--- a/data/maps/scripts/Route110_SeasideCyclingRoadNorthEntrance.s
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s
diff --git a/data/maps/scripts/Route110_SeasideCyclingRoadSouthEntrance.s b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s
index d25463993..d25463993 100644
--- a/data/maps/scripts/Route110_SeasideCyclingRoadSouthEntrance.s
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.s
diff --git a/data/maps/scripts/Route110_TrickHouseCorridor.s b/data/scripts/maps/Route110_TrickHouseCorridor.s
index 06da2482d..06da2482d 100644
--- a/data/maps/scripts/Route110_TrickHouseCorridor.s
+++ b/data/scripts/maps/Route110_TrickHouseCorridor.s
diff --git a/data/maps/scripts/Route110_TrickHouseEnd.s b/data/scripts/maps/Route110_TrickHouseEnd.s
index 4b335af91..4b335af91 100644
--- a/data/maps/scripts/Route110_TrickHouseEnd.s
+++ b/data/scripts/maps/Route110_TrickHouseEnd.s
diff --git a/data/maps/scripts/Route110_TrickHouseEntrance.s b/data/scripts/maps/Route110_TrickHouseEntrance.s
index 08d78bfa1..08d78bfa1 100644
--- a/data/maps/scripts/Route110_TrickHouseEntrance.s
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle1.s b/data/scripts/maps/Route110_TrickHousePuzzle1.s
index 074273652..074273652 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle1.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle1.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle2.s b/data/scripts/maps/Route110_TrickHousePuzzle2.s
index 0984690a1..0984690a1 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle2.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle2.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle3.s b/data/scripts/maps/Route110_TrickHousePuzzle3.s
index 309728db7..309728db7 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle3.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle3.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle4.s b/data/scripts/maps/Route110_TrickHousePuzzle4.s
index f8760aba7..f8760aba7 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle4.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle4.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle5.s b/data/scripts/maps/Route110_TrickHousePuzzle5.s
index cd5d2fbb9..cd5d2fbb9 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle5.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle5.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle6.s b/data/scripts/maps/Route110_TrickHousePuzzle6.s
index b921842d7..b921842d7 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle6.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle6.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle7.s b/data/scripts/maps/Route110_TrickHousePuzzle7.s
index a50af06c4..a50af06c4 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle7.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle7.s
diff --git a/data/maps/scripts/Route110_TrickHousePuzzle8.s b/data/scripts/maps/Route110_TrickHousePuzzle8.s
index 99100e4f6..99100e4f6 100644
--- a/data/maps/scripts/Route110_TrickHousePuzzle8.s
+++ b/data/scripts/maps/Route110_TrickHousePuzzle8.s
diff --git a/data/maps/scripts/Route111.s b/data/scripts/maps/Route111.s
index 4a977f132..4a977f132 100644
--- a/data/maps/scripts/Route111.s
+++ b/data/scripts/maps/Route111.s
diff --git a/data/maps/scripts/Route111_OldLadysRestStop.s b/data/scripts/maps/Route111_OldLadysRestStop.s
index 81f66b738..81f66b738 100644
--- a/data/maps/scripts/Route111_OldLadysRestStop.s
+++ b/data/scripts/maps/Route111_OldLadysRestStop.s
diff --git a/data/maps/scripts/Route111_WinstrateFamilysHouse.s b/data/scripts/maps/Route111_WinstrateFamilysHouse.s
index b48269333..b48269333 100644
--- a/data/maps/scripts/Route111_WinstrateFamilysHouse.s
+++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.s
diff --git a/data/maps/scripts/Route112.s b/data/scripts/maps/Route112.s
index b97a28d75..b97a28d75 100644
--- a/data/maps/scripts/Route112.s
+++ b/data/scripts/maps/Route112.s
diff --git a/data/maps/scripts/Route112_CableCarStation.s b/data/scripts/maps/Route112_CableCarStation.s
index 4d4ab5c92..4d4ab5c92 100644
--- a/data/maps/scripts/Route112_CableCarStation.s
+++ b/data/scripts/maps/Route112_CableCarStation.s
diff --git a/data/maps/scripts/Route113.s b/data/scripts/maps/Route113.s
index d56e7c5d5..d56e7c5d5 100644
--- a/data/maps/scripts/Route113.s
+++ b/data/scripts/maps/Route113.s
diff --git a/data/maps/scripts/Route113_GlassWorkshop.s b/data/scripts/maps/Route113_GlassWorkshop.s
index 51a4b7b7e..51a4b7b7e 100644
--- a/data/maps/scripts/Route113_GlassWorkshop.s
+++ b/data/scripts/maps/Route113_GlassWorkshop.s
diff --git a/data/maps/scripts/Route114.s b/data/scripts/maps/Route114.s
index da590b8d6..da590b8d6 100644
--- a/data/maps/scripts/Route114.s
+++ b/data/scripts/maps/Route114.s
diff --git a/data/maps/scripts/Route114_FossilManiacsHouse.s b/data/scripts/maps/Route114_FossilManiacsHouse.s
index 71893af74..71893af74 100644
--- a/data/maps/scripts/Route114_FossilManiacsHouse.s
+++ b/data/scripts/maps/Route114_FossilManiacsHouse.s
diff --git a/data/maps/scripts/Route114_FossilManiacsTunnel.s b/data/scripts/maps/Route114_FossilManiacsTunnel.s
index b888a3a4c..b888a3a4c 100644
--- a/data/maps/scripts/Route114_FossilManiacsTunnel.s
+++ b/data/scripts/maps/Route114_FossilManiacsTunnel.s
diff --git a/data/maps/scripts/Route114_LanettesHouse.s b/data/scripts/maps/Route114_LanettesHouse.s
index 16cc31033..16cc31033 100644
--- a/data/maps/scripts/Route114_LanettesHouse.s
+++ b/data/scripts/maps/Route114_LanettesHouse.s
diff --git a/data/maps/scripts/Route115.s b/data/scripts/maps/Route115.s
index 5cc79447a..5cc79447a 100644
--- a/data/maps/scripts/Route115.s
+++ b/data/scripts/maps/Route115.s
diff --git a/data/maps/scripts/Route116.s b/data/scripts/maps/Route116.s
index c6c6e1cb1..c6c6e1cb1 100644
--- a/data/maps/scripts/Route116.s
+++ b/data/scripts/maps/Route116.s
diff --git a/data/maps/scripts/Route116_TunnelersRestHouse.s b/data/scripts/maps/Route116_TunnelersRestHouse.s
index 87e21addd..87e21addd 100644
--- a/data/maps/scripts/Route116_TunnelersRestHouse.s
+++ b/data/scripts/maps/Route116_TunnelersRestHouse.s
diff --git a/data/maps/scripts/Route117.s b/data/scripts/maps/Route117.s
index 232ed81d4..232ed81d4 100644
--- a/data/maps/scripts/Route117.s
+++ b/data/scripts/maps/Route117.s
diff --git a/data/maps/scripts/Route117_PokemonDayCare.s b/data/scripts/maps/Route117_PokemonDayCare.s
index 15435a631..15435a631 100644
--- a/data/maps/scripts/Route117_PokemonDayCare.s
+++ b/data/scripts/maps/Route117_PokemonDayCare.s
diff --git a/data/maps/scripts/Route118.s b/data/scripts/maps/Route118.s
index e2e685aba..e2e685aba 100644
--- a/data/maps/scripts/Route118.s
+++ b/data/scripts/maps/Route118.s
diff --git a/data/maps/scripts/Route119.s b/data/scripts/maps/Route119.s
index 22e8c1c84..22e8c1c84 100644
--- a/data/maps/scripts/Route119.s
+++ b/data/scripts/maps/Route119.s
diff --git a/data/maps/scripts/Route119_House.s b/data/scripts/maps/Route119_House.s
index b18ea7a6c..b18ea7a6c 100644
--- a/data/maps/scripts/Route119_House.s
+++ b/data/scripts/maps/Route119_House.s
diff --git a/data/maps/scripts/Route119_WeatherInstitute_1F.s b/data/scripts/maps/Route119_WeatherInstitute_1F.s
index f280086f6..f280086f6 100644
--- a/data/maps/scripts/Route119_WeatherInstitute_1F.s
+++ b/data/scripts/maps/Route119_WeatherInstitute_1F.s
diff --git a/data/maps/scripts/Route119_WeatherInstitute_2F.s b/data/scripts/maps/Route119_WeatherInstitute_2F.s
index deee98d09..deee98d09 100644
--- a/data/maps/scripts/Route119_WeatherInstitute_2F.s
+++ b/data/scripts/maps/Route119_WeatherInstitute_2F.s
diff --git a/data/maps/scripts/Route120.s b/data/scripts/maps/Route120.s
index e0ef91dc0..e0ef91dc0 100644
--- a/data/maps/scripts/Route120.s
+++ b/data/scripts/maps/Route120.s
diff --git a/data/maps/scripts/Route121.s b/data/scripts/maps/Route121.s
index 096e294d5..096e294d5 100644
--- a/data/maps/scripts/Route121.s
+++ b/data/scripts/maps/Route121.s
diff --git a/data/maps/scripts/Route121_SafariZoneEntrance.s b/data/scripts/maps/Route121_SafariZoneEntrance.s
index 9d5c12e26..9d5c12e26 100644
--- a/data/maps/scripts/Route121_SafariZoneEntrance.s
+++ b/data/scripts/maps/Route121_SafariZoneEntrance.s
diff --git a/data/maps/scripts/Route122.s b/data/scripts/maps/Route122.s
index 75718c2b1..75718c2b1 100644
--- a/data/maps/scripts/Route122.s
+++ b/data/scripts/maps/Route122.s
diff --git a/data/maps/scripts/Route123.s b/data/scripts/maps/Route123.s
index eb2ae5fcf..eb2ae5fcf 100644
--- a/data/maps/scripts/Route123.s
+++ b/data/scripts/maps/Route123.s
diff --git a/data/maps/scripts/Route123_BerryMastersHouse.s b/data/scripts/maps/Route123_BerryMastersHouse.s
index b1bfb5eaa..b1bfb5eaa 100644
--- a/data/maps/scripts/Route123_BerryMastersHouse.s
+++ b/data/scripts/maps/Route123_BerryMastersHouse.s
diff --git a/data/maps/scripts/Route124.s b/data/scripts/maps/Route124.s
index d0295dd37..d0295dd37 100644
--- a/data/maps/scripts/Route124.s
+++ b/data/scripts/maps/Route124.s
diff --git a/data/maps/scripts/Route124_DivingTreasureHuntersHouse.s b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.s
index 6e7a0a0df..6e7a0a0df 100644
--- a/data/maps/scripts/Route124_DivingTreasureHuntersHouse.s
+++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.s
diff --git a/data/maps/scripts/Route125.s b/data/scripts/maps/Route125.s
index 1c51c45ad..1c51c45ad 100644
--- a/data/maps/scripts/Route125.s
+++ b/data/scripts/maps/Route125.s
diff --git a/data/maps/scripts/Route126.s b/data/scripts/maps/Route126.s
index 574d05b98..574d05b98 100644
--- a/data/maps/scripts/Route126.s
+++ b/data/scripts/maps/Route126.s
diff --git a/data/maps/scripts/Route127.s b/data/scripts/maps/Route127.s
index 5beffdbcb..5beffdbcb 100644
--- a/data/maps/scripts/Route127.s
+++ b/data/scripts/maps/Route127.s
diff --git a/data/maps/scripts/Route128.s b/data/scripts/maps/Route128.s
index 00fc7c863..00fc7c863 100644
--- a/data/maps/scripts/Route128.s
+++ b/data/scripts/maps/Route128.s
diff --git a/data/maps/scripts/Route129.s b/data/scripts/maps/Route129.s
index c6b955df8..c6b955df8 100644
--- a/data/maps/scripts/Route129.s
+++ b/data/scripts/maps/Route129.s
diff --git a/data/maps/scripts/Route130.s b/data/scripts/maps/Route130.s
index c61f7e3b1..c61f7e3b1 100644
--- a/data/maps/scripts/Route130.s
+++ b/data/scripts/maps/Route130.s
diff --git a/data/maps/scripts/Route131.s b/data/scripts/maps/Route131.s
index fb344f59b..fb344f59b 100644
--- a/data/maps/scripts/Route131.s
+++ b/data/scripts/maps/Route131.s
diff --git a/data/maps/scripts/Route132.s b/data/scripts/maps/Route132.s
index bdeaad51e..bdeaad51e 100644
--- a/data/maps/scripts/Route132.s
+++ b/data/scripts/maps/Route132.s
diff --git a/data/maps/scripts/Route133.s b/data/scripts/maps/Route133.s
index 16d937782..16d937782 100644
--- a/data/maps/scripts/Route133.s
+++ b/data/scripts/maps/Route133.s
diff --git a/data/maps/scripts/Route134.s b/data/scripts/maps/Route134.s
index f1f738f88..f1f738f88 100644
--- a/data/maps/scripts/Route134.s
+++ b/data/scripts/maps/Route134.s
diff --git a/data/maps/scripts/RustboroCity.s b/data/scripts/maps/RustboroCity.s
index b7635286d..b7635286d 100644
--- a/data/maps/scripts/RustboroCity.s
+++ b/data/scripts/maps/RustboroCity.s
diff --git a/data/maps/scripts/RustboroCity_CuttersHouse.s b/data/scripts/maps/RustboroCity_CuttersHouse.s
index f75cc842f..f75cc842f 100644
--- a/data/maps/scripts/RustboroCity_CuttersHouse.s
+++ b/data/scripts/maps/RustboroCity_CuttersHouse.s
diff --git a/data/maps/scripts/RustboroCity_DevonCorp_1F.s b/data/scripts/maps/RustboroCity_DevonCorp_1F.s
index 3c55fb9bf..3c55fb9bf 100644
--- a/data/maps/scripts/RustboroCity_DevonCorp_1F.s
+++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.s
diff --git a/data/maps/scripts/RustboroCity_DevonCorp_2F.s b/data/scripts/maps/RustboroCity_DevonCorp_2F.s
index cd05952fc..cd05952fc 100644
--- a/data/maps/scripts/RustboroCity_DevonCorp_2F.s
+++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.s
diff --git a/data/maps/scripts/RustboroCity_DevonCorp_3F.s b/data/scripts/maps/RustboroCity_DevonCorp_3F.s
index 99b5e782f..99b5e782f 100644
--- a/data/maps/scripts/RustboroCity_DevonCorp_3F.s
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.s
diff --git a/data/maps/scripts/RustboroCity_Flat1_1F.s b/data/scripts/maps/RustboroCity_Flat1_1F.s
index d84d2ba4f..d84d2ba4f 100644
--- a/data/maps/scripts/RustboroCity_Flat1_1F.s
+++ b/data/scripts/maps/RustboroCity_Flat1_1F.s
diff --git a/data/maps/scripts/RustboroCity_Flat1_2F.s b/data/scripts/maps/RustboroCity_Flat1_2F.s
index a682f160a..a682f160a 100644
--- a/data/maps/scripts/RustboroCity_Flat1_2F.s
+++ b/data/scripts/maps/RustboroCity_Flat1_2F.s
diff --git a/data/maps/scripts/RustboroCity_Flat2_1F.s b/data/scripts/maps/RustboroCity_Flat2_1F.s
index 088a6b16f..088a6b16f 100644
--- a/data/maps/scripts/RustboroCity_Flat2_1F.s
+++ b/data/scripts/maps/RustboroCity_Flat2_1F.s
diff --git a/data/maps/scripts/RustboroCity_Flat2_2F.s b/data/scripts/maps/RustboroCity_Flat2_2F.s
index bd8b0c9b7..bd8b0c9b7 100644
--- a/data/maps/scripts/RustboroCity_Flat2_2F.s
+++ b/data/scripts/maps/RustboroCity_Flat2_2F.s
diff --git a/data/maps/scripts/RustboroCity_Flat2_3F.s b/data/scripts/maps/RustboroCity_Flat2_3F.s
index 919609205..919609205 100644
--- a/data/maps/scripts/RustboroCity_Flat2_3F.s
+++ b/data/scripts/maps/RustboroCity_Flat2_3F.s
diff --git a/data/maps/scripts/RustboroCity_Gym.s b/data/scripts/maps/RustboroCity_Gym.s
index 0bf68a616..0bf68a616 100644
--- a/data/maps/scripts/RustboroCity_Gym.s
+++ b/data/scripts/maps/RustboroCity_Gym.s
diff --git a/data/maps/scripts/RustboroCity_House1.s b/data/scripts/maps/RustboroCity_House1.s
index 1eff4001e..1eff4001e 100644
--- a/data/maps/scripts/RustboroCity_House1.s
+++ b/data/scripts/maps/RustboroCity_House1.s
diff --git a/data/maps/scripts/RustboroCity_House2.s b/data/scripts/maps/RustboroCity_House2.s
index 66eeedf9b..66eeedf9b 100644
--- a/data/maps/scripts/RustboroCity_House2.s
+++ b/data/scripts/maps/RustboroCity_House2.s
diff --git a/data/maps/scripts/RustboroCity_House3.s b/data/scripts/maps/RustboroCity_House3.s
index 60978400e..60978400e 100644
--- a/data/maps/scripts/RustboroCity_House3.s
+++ b/data/scripts/maps/RustboroCity_House3.s
diff --git a/data/maps/scripts/RustboroCity_Mart.s b/data/scripts/maps/RustboroCity_Mart.s
index 245d02056..245d02056 100644
--- a/data/maps/scripts/RustboroCity_Mart.s
+++ b/data/scripts/maps/RustboroCity_Mart.s
diff --git a/data/maps/scripts/RustboroCity_PokemonCenter_1F.s b/data/scripts/maps/RustboroCity_PokemonCenter_1F.s
index 488c97722..488c97722 100644
--- a/data/maps/scripts/RustboroCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/RustboroCity_PokemonCenter_2F.s b/data/scripts/maps/RustboroCity_PokemonCenter_2F.s
index 6f983d651..6f983d651 100644
--- a/data/maps/scripts/RustboroCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/RustboroCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/RustboroCity_PokemonSchool.s b/data/scripts/maps/RustboroCity_PokemonSchool.s
index af475848f..af475848f 100644
--- a/data/maps/scripts/RustboroCity_PokemonSchool.s
+++ b/data/scripts/maps/RustboroCity_PokemonSchool.s
diff --git a/data/maps/scripts/RusturfTunnel.s b/data/scripts/maps/RusturfTunnel.s
index cd920e333..cd920e333 100644
--- a/data/maps/scripts/RusturfTunnel.s
+++ b/data/scripts/maps/RusturfTunnel.s
diff --git a/data/maps/scripts/SSTidalCorridor.s b/data/scripts/maps/SSTidalCorridor.s
index f143d3261..f143d3261 100644
--- a/data/maps/scripts/SSTidalCorridor.s
+++ b/data/scripts/maps/SSTidalCorridor.s
diff --git a/data/maps/scripts/SSTidalLowerDeck.s b/data/scripts/maps/SSTidalLowerDeck.s
index f3dc6f0a0..f3dc6f0a0 100644
--- a/data/maps/scripts/SSTidalLowerDeck.s
+++ b/data/scripts/maps/SSTidalLowerDeck.s
diff --git a/data/maps/scripts/SSTidalRooms.s b/data/scripts/maps/SSTidalRooms.s
index 860b00a47..860b00a47 100644
--- a/data/maps/scripts/SSTidalRooms.s
+++ b/data/scripts/maps/SSTidalRooms.s
diff --git a/data/maps/scripts/SafariZone_Northeast.s b/data/scripts/maps/SafariZone_Northeast.s
index bb301e4fa..bb301e4fa 100644
--- a/data/maps/scripts/SafariZone_Northeast.s
+++ b/data/scripts/maps/SafariZone_Northeast.s
diff --git a/data/maps/scripts/SafariZone_Northwest.s b/data/scripts/maps/SafariZone_Northwest.s
index 4f30ad378..4f30ad378 100644
--- a/data/maps/scripts/SafariZone_Northwest.s
+++ b/data/scripts/maps/SafariZone_Northwest.s
diff --git a/data/maps/scripts/SafariZone_RestHouse.s b/data/scripts/maps/SafariZone_RestHouse.s
index ace6e6473..ace6e6473 100644
--- a/data/maps/scripts/SafariZone_RestHouse.s
+++ b/data/scripts/maps/SafariZone_RestHouse.s
diff --git a/data/maps/scripts/SafariZone_Southeast.s b/data/scripts/maps/SafariZone_Southeast.s
index 38fa96053..38fa96053 100644
--- a/data/maps/scripts/SafariZone_Southeast.s
+++ b/data/scripts/maps/SafariZone_Southeast.s
diff --git a/data/maps/scripts/SafariZone_Southwest.s b/data/scripts/maps/SafariZone_Southwest.s
index 158b8720f..158b8720f 100644
--- a/data/maps/scripts/SafariZone_Southwest.s
+++ b/data/scripts/maps/SafariZone_Southwest.s
diff --git a/data/maps/scripts/ScorchedSlab.s b/data/scripts/maps/ScorchedSlab.s
index bf5074e95..bf5074e95 100644
--- a/data/maps/scripts/ScorchedSlab.s
+++ b/data/scripts/maps/ScorchedSlab.s
diff --git a/data/maps/scripts/SeafloorCavern_Entrance.s b/data/scripts/maps/SeafloorCavern_Entrance.s
index 5f2788cf9..5f2788cf9 100644
--- a/data/maps/scripts/SeafloorCavern_Entrance.s
+++ b/data/scripts/maps/SeafloorCavern_Entrance.s
diff --git a/data/maps/scripts/SeafloorCavern_Room1.s b/data/scripts/maps/SeafloorCavern_Room1.s
index 4cc0ea0cd..4cc0ea0cd 100644
--- a/data/maps/scripts/SeafloorCavern_Room1.s
+++ b/data/scripts/maps/SeafloorCavern_Room1.s
diff --git a/data/maps/scripts/SeafloorCavern_Room2.s b/data/scripts/maps/SeafloorCavern_Room2.s
index cc53a220a..cc53a220a 100644
--- a/data/maps/scripts/SeafloorCavern_Room2.s
+++ b/data/scripts/maps/SeafloorCavern_Room2.s
diff --git a/data/maps/scripts/SeafloorCavern_Room3.s b/data/scripts/maps/SeafloorCavern_Room3.s
index 6d836adc7..6d836adc7 100644
--- a/data/maps/scripts/SeafloorCavern_Room3.s
+++ b/data/scripts/maps/SeafloorCavern_Room3.s
diff --git a/data/maps/scripts/SeafloorCavern_Room4.s b/data/scripts/maps/SeafloorCavern_Room4.s
index 1e79317c7..1e79317c7 100644
--- a/data/maps/scripts/SeafloorCavern_Room4.s
+++ b/data/scripts/maps/SeafloorCavern_Room4.s
diff --git a/data/maps/scripts/SeafloorCavern_Room5.s b/data/scripts/maps/SeafloorCavern_Room5.s
index 0bccaf57d..0bccaf57d 100644
--- a/data/maps/scripts/SeafloorCavern_Room5.s
+++ b/data/scripts/maps/SeafloorCavern_Room5.s
diff --git a/data/maps/scripts/SeafloorCavern_Room6.s b/data/scripts/maps/SeafloorCavern_Room6.s
index c765f7715..c765f7715 100644
--- a/data/maps/scripts/SeafloorCavern_Room6.s
+++ b/data/scripts/maps/SeafloorCavern_Room6.s
diff --git a/data/maps/scripts/SeafloorCavern_Room7.s b/data/scripts/maps/SeafloorCavern_Room7.s
index b0a2e1cd3..b0a2e1cd3 100644
--- a/data/maps/scripts/SeafloorCavern_Room7.s
+++ b/data/scripts/maps/SeafloorCavern_Room7.s
diff --git a/data/maps/scripts/SeafloorCavern_Room8.s b/data/scripts/maps/SeafloorCavern_Room8.s
index 48858c411..48858c411 100644
--- a/data/maps/scripts/SeafloorCavern_Room8.s
+++ b/data/scripts/maps/SeafloorCavern_Room8.s
diff --git a/data/maps/scripts/SeafloorCavern_Room9.s b/data/scripts/maps/SeafloorCavern_Room9.s
index 2308cbbf5..2308cbbf5 100644
--- a/data/maps/scripts/SeafloorCavern_Room9.s
+++ b/data/scripts/maps/SeafloorCavern_Room9.s
diff --git a/data/maps/scripts/SealedChamber_InnerRoom.s b/data/scripts/maps/SealedChamber_InnerRoom.s
index 42a6bfce7..42a6bfce7 100644
--- a/data/maps/scripts/SealedChamber_InnerRoom.s
+++ b/data/scripts/maps/SealedChamber_InnerRoom.s
diff --git a/data/maps/scripts/SealedChamber_OuterRoom.s b/data/scripts/maps/SealedChamber_OuterRoom.s
index ed7a5b6bd..ed7a5b6bd 100644
--- a/data/maps/scripts/SealedChamber_OuterRoom.s
+++ b/data/scripts/maps/SealedChamber_OuterRoom.s
diff --git a/data/maps/scripts/SecretBase_BlueCave1.s b/data/scripts/maps/SecretBase_BlueCave1.s
index bca6bee55..bca6bee55 100644
--- a/data/maps/scripts/SecretBase_BlueCave1.s
+++ b/data/scripts/maps/SecretBase_BlueCave1.s
diff --git a/data/maps/scripts/SecretBase_BlueCave2.s b/data/scripts/maps/SecretBase_BlueCave2.s
index 4fc579fb9..4fc579fb9 100644
--- a/data/maps/scripts/SecretBase_BlueCave2.s
+++ b/data/scripts/maps/SecretBase_BlueCave2.s
diff --git a/data/maps/scripts/SecretBase_BlueCave3.s b/data/scripts/maps/SecretBase_BlueCave3.s
index 0a8199f19..0a8199f19 100644
--- a/data/maps/scripts/SecretBase_BlueCave3.s
+++ b/data/scripts/maps/SecretBase_BlueCave3.s
diff --git a/data/maps/scripts/SecretBase_BlueCave4.s b/data/scripts/maps/SecretBase_BlueCave4.s
index 72c1e9612..72c1e9612 100644
--- a/data/maps/scripts/SecretBase_BlueCave4.s
+++ b/data/scripts/maps/SecretBase_BlueCave4.s
diff --git a/data/maps/scripts/SecretBase_BrownCave1.s b/data/scripts/maps/SecretBase_BrownCave1.s
index ddbf182e4..ddbf182e4 100644
--- a/data/maps/scripts/SecretBase_BrownCave1.s
+++ b/data/scripts/maps/SecretBase_BrownCave1.s
diff --git a/data/maps/scripts/SecretBase_BrownCave2.s b/data/scripts/maps/SecretBase_BrownCave2.s
index 06dcb6335..06dcb6335 100644
--- a/data/maps/scripts/SecretBase_BrownCave2.s
+++ b/data/scripts/maps/SecretBase_BrownCave2.s
diff --git a/data/maps/scripts/SecretBase_BrownCave3.s b/data/scripts/maps/SecretBase_BrownCave3.s
index a0a85dc11..a0a85dc11 100644
--- a/data/maps/scripts/SecretBase_BrownCave3.s
+++ b/data/scripts/maps/SecretBase_BrownCave3.s
diff --git a/data/maps/scripts/SecretBase_BrownCave4.s b/data/scripts/maps/SecretBase_BrownCave4.s
index 12d931e9e..12d931e9e 100644
--- a/data/maps/scripts/SecretBase_BrownCave4.s
+++ b/data/scripts/maps/SecretBase_BrownCave4.s
diff --git a/data/maps/scripts/SecretBase_RedCave1.s b/data/scripts/maps/SecretBase_RedCave1.s
index 77b99daec..77b99daec 100644
--- a/data/maps/scripts/SecretBase_RedCave1.s
+++ b/data/scripts/maps/SecretBase_RedCave1.s
diff --git a/data/maps/scripts/SecretBase_RedCave2.s b/data/scripts/maps/SecretBase_RedCave2.s
index 735d386fc..735d386fc 100644
--- a/data/maps/scripts/SecretBase_RedCave2.s
+++ b/data/scripts/maps/SecretBase_RedCave2.s
diff --git a/data/maps/scripts/SecretBase_RedCave3.s b/data/scripts/maps/SecretBase_RedCave3.s
index c9b72ca30..c9b72ca30 100644
--- a/data/maps/scripts/SecretBase_RedCave3.s
+++ b/data/scripts/maps/SecretBase_RedCave3.s
diff --git a/data/maps/scripts/SecretBase_RedCave4.s b/data/scripts/maps/SecretBase_RedCave4.s
index 6d2402f03..6d2402f03 100644
--- a/data/maps/scripts/SecretBase_RedCave4.s
+++ b/data/scripts/maps/SecretBase_RedCave4.s
diff --git a/data/maps/scripts/SecretBase_Shrub1.s b/data/scripts/maps/SecretBase_Shrub1.s
index 79116a0cf..79116a0cf 100644
--- a/data/maps/scripts/SecretBase_Shrub1.s
+++ b/data/scripts/maps/SecretBase_Shrub1.s
diff --git a/data/maps/scripts/SecretBase_Shrub2.s b/data/scripts/maps/SecretBase_Shrub2.s
index 49835f7f3..49835f7f3 100644
--- a/data/maps/scripts/SecretBase_Shrub2.s
+++ b/data/scripts/maps/SecretBase_Shrub2.s
diff --git a/data/maps/scripts/SecretBase_Shrub3.s b/data/scripts/maps/SecretBase_Shrub3.s
index 0aeb7bdf9..0aeb7bdf9 100644
--- a/data/maps/scripts/SecretBase_Shrub3.s
+++ b/data/scripts/maps/SecretBase_Shrub3.s
diff --git a/data/maps/scripts/SecretBase_Shrub4.s b/data/scripts/maps/SecretBase_Shrub4.s
index f131b308d..f131b308d 100644
--- a/data/maps/scripts/SecretBase_Shrub4.s
+++ b/data/scripts/maps/SecretBase_Shrub4.s
diff --git a/data/maps/scripts/SecretBase_Tree1.s b/data/scripts/maps/SecretBase_Tree1.s
index 7345c3bbb..7345c3bbb 100644
--- a/data/maps/scripts/SecretBase_Tree1.s
+++ b/data/scripts/maps/SecretBase_Tree1.s
diff --git a/data/maps/scripts/SecretBase_Tree2.s b/data/scripts/maps/SecretBase_Tree2.s
index 0f2976a8c..0f2976a8c 100644
--- a/data/maps/scripts/SecretBase_Tree2.s
+++ b/data/scripts/maps/SecretBase_Tree2.s
diff --git a/data/maps/scripts/SecretBase_Tree3.s b/data/scripts/maps/SecretBase_Tree3.s
index cb80b0d25..cb80b0d25 100644
--- a/data/maps/scripts/SecretBase_Tree3.s
+++ b/data/scripts/maps/SecretBase_Tree3.s
diff --git a/data/maps/scripts/SecretBase_Tree4.s b/data/scripts/maps/SecretBase_Tree4.s
index 0a6771740..0a6771740 100644
--- a/data/maps/scripts/SecretBase_Tree4.s
+++ b/data/scripts/maps/SecretBase_Tree4.s
diff --git a/data/maps/scripts/SecretBase_YellowCave1.s b/data/scripts/maps/SecretBase_YellowCave1.s
index b76a5f44e..b76a5f44e 100644
--- a/data/maps/scripts/SecretBase_YellowCave1.s
+++ b/data/scripts/maps/SecretBase_YellowCave1.s
diff --git a/data/maps/scripts/SecretBase_YellowCave2.s b/data/scripts/maps/SecretBase_YellowCave2.s
index 0bc1fc354..0bc1fc354 100644
--- a/data/maps/scripts/SecretBase_YellowCave2.s
+++ b/data/scripts/maps/SecretBase_YellowCave2.s
diff --git a/data/maps/scripts/SecretBase_YellowCave3.s b/data/scripts/maps/SecretBase_YellowCave3.s
index 137f04316..137f04316 100644
--- a/data/maps/scripts/SecretBase_YellowCave3.s
+++ b/data/scripts/maps/SecretBase_YellowCave3.s
diff --git a/data/maps/scripts/SecretBase_YellowCave4.s b/data/scripts/maps/SecretBase_YellowCave4.s
index 7f6ba9644..7f6ba9644 100644
--- a/data/maps/scripts/SecretBase_YellowCave4.s
+++ b/data/scripts/maps/SecretBase_YellowCave4.s
diff --git a/data/maps/scripts/ShoalCave_HighTideEntranceRoom.s b/data/scripts/maps/ShoalCave_HighTideEntranceRoom.s
index 7e9c3cea2..7e9c3cea2 100644
--- a/data/maps/scripts/ShoalCave_HighTideEntranceRoom.s
+++ b/data/scripts/maps/ShoalCave_HighTideEntranceRoom.s
diff --git a/data/maps/scripts/ShoalCave_HighTideInnerRoom.s b/data/scripts/maps/ShoalCave_HighTideInnerRoom.s
index ed506a50e..ed506a50e 100644
--- a/data/maps/scripts/ShoalCave_HighTideInnerRoom.s
+++ b/data/scripts/maps/ShoalCave_HighTideInnerRoom.s
diff --git a/data/maps/scripts/ShoalCave_LowTideEntranceRoom.s b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.s
index f44c79dfe..f44c79dfe 100644
--- a/data/maps/scripts/ShoalCave_LowTideEntranceRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.s
diff --git a/data/maps/scripts/ShoalCave_LowTideIceRoom.s b/data/scripts/maps/ShoalCave_LowTideIceRoom.s
index 1290d6efd..1290d6efd 100644
--- a/data/maps/scripts/ShoalCave_LowTideIceRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideIceRoom.s
diff --git a/data/maps/scripts/ShoalCave_LowTideInnerRoom.s b/data/scripts/maps/ShoalCave_LowTideInnerRoom.s
index d00193e42..d00193e42 100644
--- a/data/maps/scripts/ShoalCave_LowTideInnerRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.s
diff --git a/data/maps/scripts/ShoalCave_LowTideLowerRoom.s b/data/scripts/maps/ShoalCave_LowTideLowerRoom.s
index 4ffed780e..4ffed780e 100644
--- a/data/maps/scripts/ShoalCave_LowTideLowerRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.s
diff --git a/data/maps/scripts/ShoalCave_LowTideStairsRoom.s b/data/scripts/maps/ShoalCave_LowTideStairsRoom.s
index bf660eaa4..bf660eaa4 100644
--- a/data/maps/scripts/ShoalCave_LowTideStairsRoom.s
+++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.s
diff --git a/data/maps/scripts/SingleBattleColosseum.s b/data/scripts/maps/SingleBattleColosseum.s
index 270e4b670..270e4b670 100644
--- a/data/maps/scripts/SingleBattleColosseum.s
+++ b/data/scripts/maps/SingleBattleColosseum.s
diff --git a/data/maps/scripts/SkyPillar_1F.s b/data/scripts/maps/SkyPillar_1F.s
index 6afcecf08..6afcecf08 100644
--- a/data/maps/scripts/SkyPillar_1F.s
+++ b/data/scripts/maps/SkyPillar_1F.s
diff --git a/data/maps/scripts/SkyPillar_2F.s b/data/scripts/maps/SkyPillar_2F.s
index 7a473a795..7a473a795 100644
--- a/data/maps/scripts/SkyPillar_2F.s
+++ b/data/scripts/maps/SkyPillar_2F.s
diff --git a/data/maps/scripts/SkyPillar_3F.s b/data/scripts/maps/SkyPillar_3F.s
index 6b0afa4d0..6b0afa4d0 100644
--- a/data/maps/scripts/SkyPillar_3F.s
+++ b/data/scripts/maps/SkyPillar_3F.s
diff --git a/data/maps/scripts/SkyPillar_4F.s b/data/scripts/maps/SkyPillar_4F.s
index 22128480c..22128480c 100644
--- a/data/maps/scripts/SkyPillar_4F.s
+++ b/data/scripts/maps/SkyPillar_4F.s
diff --git a/data/maps/scripts/SkyPillar_5F.s b/data/scripts/maps/SkyPillar_5F.s
index cf0e60ecb..cf0e60ecb 100644
--- a/data/maps/scripts/SkyPillar_5F.s
+++ b/data/scripts/maps/SkyPillar_5F.s
diff --git a/data/maps/scripts/SkyPillar_Entrance.s b/data/scripts/maps/SkyPillar_Entrance.s
index 09eb538c9..09eb538c9 100644
--- a/data/maps/scripts/SkyPillar_Entrance.s
+++ b/data/scripts/maps/SkyPillar_Entrance.s
diff --git a/data/maps/scripts/SkyPillar_Outside.s b/data/scripts/maps/SkyPillar_Outside.s
index 338593de7..338593de7 100644
--- a/data/maps/scripts/SkyPillar_Outside.s
+++ b/data/scripts/maps/SkyPillar_Outside.s
diff --git a/data/maps/scripts/SkyPillar_Top.s b/data/scripts/maps/SkyPillar_Top.s
index 970725bf8..970725bf8 100644
--- a/data/maps/scripts/SkyPillar_Top.s
+++ b/data/scripts/maps/SkyPillar_Top.s
diff --git a/data/maps/scripts/SlateportCity.s b/data/scripts/maps/SlateportCity.s
index 47db3a3fa..47db3a3fa 100644
--- a/data/maps/scripts/SlateportCity.s
+++ b/data/scripts/maps/SlateportCity.s
diff --git a/data/maps/scripts/SlateportCity_ContestHall.s b/data/scripts/maps/SlateportCity_ContestHall.s
index 2e33c1ec5..2e33c1ec5 100644
--- a/data/maps/scripts/SlateportCity_ContestHall.s
+++ b/data/scripts/maps/SlateportCity_ContestHall.s
diff --git a/data/maps/scripts/SlateportCity_ContestLobby.s b/data/scripts/maps/SlateportCity_ContestLobby.s
index 871f95f33..871f95f33 100644
--- a/data/maps/scripts/SlateportCity_ContestLobby.s
+++ b/data/scripts/maps/SlateportCity_ContestLobby.s
diff --git a/data/maps/scripts/SlateportCity_Harbor.s b/data/scripts/maps/SlateportCity_Harbor.s
index 8bdccdbb9..8bdccdbb9 100644
--- a/data/maps/scripts/SlateportCity_Harbor.s
+++ b/data/scripts/maps/SlateportCity_Harbor.s
diff --git a/data/maps/scripts/SlateportCity_House1.s b/data/scripts/maps/SlateportCity_House1.s
index bde33129c..bde33129c 100644
--- a/data/maps/scripts/SlateportCity_House1.s
+++ b/data/scripts/maps/SlateportCity_House1.s
diff --git a/data/maps/scripts/SlateportCity_House2.s b/data/scripts/maps/SlateportCity_House2.s
index 87581ceaf..87581ceaf 100644
--- a/data/maps/scripts/SlateportCity_House2.s
+++ b/data/scripts/maps/SlateportCity_House2.s
diff --git a/data/maps/scripts/SlateportCity_Mart.s b/data/scripts/maps/SlateportCity_Mart.s
index f2c8f029b..f2c8f029b 100644
--- a/data/maps/scripts/SlateportCity_Mart.s
+++ b/data/scripts/maps/SlateportCity_Mart.s
diff --git a/data/maps/scripts/SlateportCity_OceanicMuseum_1F.s b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s
index 10dcb66d8..10dcb66d8 100644
--- a/data/maps/scripts/SlateportCity_OceanicMuseum_1F.s
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.s
diff --git a/data/maps/scripts/SlateportCity_OceanicMuseum_2F.s b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s
index 28b098126..28b098126 100644
--- a/data/maps/scripts/SlateportCity_OceanicMuseum_2F.s
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.s
diff --git a/data/maps/scripts/SlateportCity_PokemonCenter_1F.s b/data/scripts/maps/SlateportCity_PokemonCenter_1F.s
index a8ef51f52..a8ef51f52 100644
--- a/data/maps/scripts/SlateportCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/SlateportCity_PokemonCenter_2F.s b/data/scripts/maps/SlateportCity_PokemonCenter_2F.s
index 1f5216d11..1f5216d11 100644
--- a/data/maps/scripts/SlateportCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/SlateportCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/SlateportCity_PokemonFanClub.s b/data/scripts/maps/SlateportCity_PokemonFanClub.s
index ecaf833e8..ecaf833e8 100644
--- a/data/maps/scripts/SlateportCity_PokemonFanClub.s
+++ b/data/scripts/maps/SlateportCity_PokemonFanClub.s
diff --git a/data/maps/scripts/SlateportCity_SternsShipyard_1F.s b/data/scripts/maps/SlateportCity_SternsShipyard_1F.s
index 64c81d3c4..64c81d3c4 100644
--- a/data/maps/scripts/SlateportCity_SternsShipyard_1F.s
+++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.s
diff --git a/data/maps/scripts/SlateportCity_SternsShipyard_2F.s b/data/scripts/maps/SlateportCity_SternsShipyard_2F.s
index 069b5c9f8..069b5c9f8 100644
--- a/data/maps/scripts/SlateportCity_SternsShipyard_2F.s
+++ b/data/scripts/maps/SlateportCity_SternsShipyard_2F.s
diff --git a/data/maps/scripts/SootopolisCity.s b/data/scripts/maps/SootopolisCity.s
index 1690b8104..1690b8104 100644
--- a/data/maps/scripts/SootopolisCity.s
+++ b/data/scripts/maps/SootopolisCity.s
diff --git a/data/maps/scripts/SootopolisCity_Gym_1F.s b/data/scripts/maps/SootopolisCity_Gym_1F.s
index fa52b4da3..fa52b4da3 100644
--- a/data/maps/scripts/SootopolisCity_Gym_1F.s
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.s
diff --git a/data/maps/scripts/SootopolisCity_Gym_B1F.s b/data/scripts/maps/SootopolisCity_Gym_B1F.s
index 21bbc1558..21bbc1558 100644
--- a/data/maps/scripts/SootopolisCity_Gym_B1F.s
+++ b/data/scripts/maps/SootopolisCity_Gym_B1F.s
diff --git a/data/maps/scripts/SootopolisCity_House1.s b/data/scripts/maps/SootopolisCity_House1.s
index a2243206c..a2243206c 100644
--- a/data/maps/scripts/SootopolisCity_House1.s
+++ b/data/scripts/maps/SootopolisCity_House1.s
diff --git a/data/maps/scripts/SootopolisCity_House2.s b/data/scripts/maps/SootopolisCity_House2.s
index cb99f1004..cb99f1004 100644
--- a/data/maps/scripts/SootopolisCity_House2.s
+++ b/data/scripts/maps/SootopolisCity_House2.s
diff --git a/data/maps/scripts/SootopolisCity_House3.s b/data/scripts/maps/SootopolisCity_House3.s
index 7ebfa3787..7ebfa3787 100644
--- a/data/maps/scripts/SootopolisCity_House3.s
+++ b/data/scripts/maps/SootopolisCity_House3.s
diff --git a/data/maps/scripts/SootopolisCity_House4.s b/data/scripts/maps/SootopolisCity_House4.s
index f8fdd8b4b..f8fdd8b4b 100644
--- a/data/maps/scripts/SootopolisCity_House4.s
+++ b/data/scripts/maps/SootopolisCity_House4.s
diff --git a/data/maps/scripts/SootopolisCity_House5.s b/data/scripts/maps/SootopolisCity_House5.s
index b42855160..b42855160 100644
--- a/data/maps/scripts/SootopolisCity_House5.s
+++ b/data/scripts/maps/SootopolisCity_House5.s
diff --git a/data/maps/scripts/SootopolisCity_House6.s b/data/scripts/maps/SootopolisCity_House6.s
index 429d0c438..429d0c438 100644
--- a/data/maps/scripts/SootopolisCity_House6.s
+++ b/data/scripts/maps/SootopolisCity_House6.s
diff --git a/data/maps/scripts/SootopolisCity_House7.s b/data/scripts/maps/SootopolisCity_House7.s
index 889f8993d..889f8993d 100644
--- a/data/maps/scripts/SootopolisCity_House7.s
+++ b/data/scripts/maps/SootopolisCity_House7.s
diff --git a/data/maps/scripts/SootopolisCity_House8.s b/data/scripts/maps/SootopolisCity_House8.s
index 0f9ee3580..0f9ee3580 100644
--- a/data/maps/scripts/SootopolisCity_House8.s
+++ b/data/scripts/maps/SootopolisCity_House8.s
diff --git a/data/maps/scripts/SootopolisCity_Mart.s b/data/scripts/maps/SootopolisCity_Mart.s
index 7dcb0e274..7dcb0e274 100644
--- a/data/maps/scripts/SootopolisCity_Mart.s
+++ b/data/scripts/maps/SootopolisCity_Mart.s
diff --git a/data/maps/scripts/SootopolisCity_PokemonCenter_1F.s b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s
index 1221fb845..1221fb845 100644
--- a/data/maps/scripts/SootopolisCity_PokemonCenter_1F.s
+++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.s
diff --git a/data/maps/scripts/SootopolisCity_PokemonCenter_2F.s b/data/scripts/maps/SootopolisCity_PokemonCenter_2F.s
index 2046a9042..2046a9042 100644
--- a/data/maps/scripts/SootopolisCity_PokemonCenter_2F.s
+++ b/data/scripts/maps/SootopolisCity_PokemonCenter_2F.s
diff --git a/data/maps/scripts/SouthernIsland_Exterior.s b/data/scripts/maps/SouthernIsland_Exterior.s
index 9723647cd..9723647cd 100644
--- a/data/maps/scripts/SouthernIsland_Exterior.s
+++ b/data/scripts/maps/SouthernIsland_Exterior.s
diff --git a/data/maps/scripts/SouthernIsland_Interior.s b/data/scripts/maps/SouthernIsland_Interior.s
index 63e5b78a9..63e5b78a9 100644
--- a/data/maps/scripts/SouthernIsland_Interior.s
+++ b/data/scripts/maps/SouthernIsland_Interior.s
diff --git a/data/maps/scripts/TradeCenter.s b/data/scripts/maps/TradeCenter.s
index 44efcf62f..44efcf62f 100644
--- a/data/maps/scripts/TradeCenter.s
+++ b/data/scripts/maps/TradeCenter.s
diff --git a/data/maps/scripts/Underwater1.s b/data/scripts/maps/Underwater1.s
index aedbe82c4..aedbe82c4 100644
--- a/data/maps/scripts/Underwater1.s
+++ b/data/scripts/maps/Underwater1.s
diff --git a/data/maps/scripts/Underwater2.s b/data/scripts/maps/Underwater2.s
index 4da2a5cb2..4da2a5cb2 100644
--- a/data/maps/scripts/Underwater2.s
+++ b/data/scripts/maps/Underwater2.s
diff --git a/data/maps/scripts/Underwater3.s b/data/scripts/maps/Underwater3.s
index b87c72c9f..b87c72c9f 100644
--- a/data/maps/scripts/Underwater3.s
+++ b/data/scripts/maps/Underwater3.s
diff --git a/data/maps/scripts/Underwater4.s b/data/scripts/maps/Underwater4.s
index a6d8f1bd0..a6d8f1bd0 100644
--- a/data/maps/scripts/Underwater4.s
+++ b/data/scripts/maps/Underwater4.s
diff --git a/data/maps/scripts/Underwater_Route134.s b/data/scripts/maps/Underwater_Route134.s
index 427481eda..427481eda 100644
--- a/data/maps/scripts/Underwater_Route134.s
+++ b/data/scripts/maps/Underwater_Route134.s
diff --git a/data/maps/scripts/Underwater_SeafloorCavern.s b/data/scripts/maps/Underwater_SeafloorCavern.s
index 4a0388146..4a0388146 100644
--- a/data/maps/scripts/Underwater_SeafloorCavern.s
+++ b/data/scripts/maps/Underwater_SeafloorCavern.s
diff --git a/data/maps/scripts/Underwater_SealedChamber.s b/data/scripts/maps/Underwater_SealedChamber.s
index 8e790ddc0..8e790ddc0 100644
--- a/data/maps/scripts/Underwater_SealedChamber.s
+++ b/data/scripts/maps/Underwater_SealedChamber.s
diff --git a/data/maps/scripts/Underwater_SootopolisCity.s b/data/scripts/maps/Underwater_SootopolisCity.s
index aa3465cb7..aa3465cb7 100644
--- a/data/maps/scripts/Underwater_SootopolisCity.s
+++ b/data/scripts/maps/Underwater_SootopolisCity.s
diff --git a/data/maps/scripts/UnknownMap_25_29.s b/data/scripts/maps/UnknownMap_25_29.s
index a62e0c9f3..a62e0c9f3 100644
--- a/data/maps/scripts/UnknownMap_25_29.s
+++ b/data/scripts/maps/UnknownMap_25_29.s
diff --git a/data/maps/scripts/UnknownMap_25_30.s b/data/scripts/maps/UnknownMap_25_30.s
index 70a1f0ac2..70a1f0ac2 100644
--- a/data/maps/scripts/UnknownMap_25_30.s
+++ b/data/scripts/maps/UnknownMap_25_30.s
diff --git a/data/maps/scripts/UnknownMap_25_31.s b/data/scripts/maps/UnknownMap_25_31.s
index 44c67cab5..44c67cab5 100644
--- a/data/maps/scripts/UnknownMap_25_31.s
+++ b/data/scripts/maps/UnknownMap_25_31.s
diff --git a/data/maps/scripts/UnknownMap_25_32.s b/data/scripts/maps/UnknownMap_25_32.s
index 485a626e6..485a626e6 100644
--- a/data/maps/scripts/UnknownMap_25_32.s
+++ b/data/scripts/maps/UnknownMap_25_32.s
diff --git a/data/maps/scripts/UnknownMap_25_33.s b/data/scripts/maps/UnknownMap_25_33.s
index 68feb9cc6..68feb9cc6 100644
--- a/data/maps/scripts/UnknownMap_25_33.s
+++ b/data/scripts/maps/UnknownMap_25_33.s
diff --git a/data/maps/scripts/UnknownMap_25_34.s b/data/scripts/maps/UnknownMap_25_34.s
index 3fc7b181a..3fc7b181a 100644
--- a/data/maps/scripts/UnknownMap_25_34.s
+++ b/data/scripts/maps/UnknownMap_25_34.s
diff --git a/data/maps/scripts/VerdanturfTown.s b/data/scripts/maps/VerdanturfTown.s
index 6b702a243..6b702a243 100644
--- a/data/maps/scripts/VerdanturfTown.s
+++ b/data/scripts/maps/VerdanturfTown.s
diff --git a/data/maps/scripts/VerdanturfTown_ContestHall.s b/data/scripts/maps/VerdanturfTown_ContestHall.s
index fe4f91cef..fe4f91cef 100644
--- a/data/maps/scripts/VerdanturfTown_ContestHall.s
+++ b/data/scripts/maps/VerdanturfTown_ContestHall.s
diff --git a/data/maps/scripts/VerdanturfTown_ContestLobby.s b/data/scripts/maps/VerdanturfTown_ContestLobby.s
index 2f0d74896..2f0d74896 100644
--- a/data/maps/scripts/VerdanturfTown_ContestLobby.s
+++ b/data/scripts/maps/VerdanturfTown_ContestLobby.s
diff --git a/data/maps/scripts/VerdanturfTown_FriendshipRatersHouse.s b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s
index f2b561733..f2b561733 100644
--- a/data/maps/scripts/VerdanturfTown_FriendshipRatersHouse.s
+++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.s
diff --git a/data/maps/scripts/VerdanturfTown_House.s b/data/scripts/maps/VerdanturfTown_House.s
index fc9f5ffd9..fc9f5ffd9 100644
--- a/data/maps/scripts/VerdanturfTown_House.s
+++ b/data/scripts/maps/VerdanturfTown_House.s
diff --git a/data/maps/scripts/VerdanturfTown_Mart.s b/data/scripts/maps/VerdanturfTown_Mart.s
index 08634cb85..08634cb85 100644
--- a/data/maps/scripts/VerdanturfTown_Mart.s
+++ b/data/scripts/maps/VerdanturfTown_Mart.s
diff --git a/data/maps/scripts/VerdanturfTown_PokemonCenter_1F.s b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s
index 7b8dcfc8f..7b8dcfc8f 100644
--- a/data/maps/scripts/VerdanturfTown_PokemonCenter_1F.s
+++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.s
diff --git a/data/maps/scripts/VerdanturfTown_PokemonCenter_2F.s b/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s
index 113e3cfee..113e3cfee 100644
--- a/data/maps/scripts/VerdanturfTown_PokemonCenter_2F.s
+++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.s
diff --git a/data/maps/scripts/VerdanturfTown_WandasHouse.s b/data/scripts/maps/VerdanturfTown_WandasHouse.s
index eb497c426..eb497c426 100644
--- a/data/maps/scripts/VerdanturfTown_WandasHouse.s
+++ b/data/scripts/maps/VerdanturfTown_WandasHouse.s
diff --git a/data/maps/scripts/VictoryRoad_1F.s b/data/scripts/maps/VictoryRoad_1F.s
index 88865f4eb..88865f4eb 100644
--- a/data/maps/scripts/VictoryRoad_1F.s
+++ b/data/scripts/maps/VictoryRoad_1F.s
diff --git a/data/maps/scripts/VictoryRoad_B1F.s b/data/scripts/maps/VictoryRoad_B1F.s
index a4f40b815..a4f40b815 100644
--- a/data/maps/scripts/VictoryRoad_B1F.s
+++ b/data/scripts/maps/VictoryRoad_B1F.s
diff --git a/data/maps/scripts/VictoryRoad_B2F.s b/data/scripts/maps/VictoryRoad_B2F.s
index 39ac84e92..39ac84e92 100644
--- a/data/maps/scripts/VictoryRoad_B2F.s
+++ b/data/scripts/maps/VictoryRoad_B2F.s
diff --git a/data/maps/text/AbandonedShip_CaptainsOffice.s b/data/text/maps/AbandonedShip_CaptainsOffice.s
index 69d09ed99..69d09ed99 100644
--- a/data/maps/text/AbandonedShip_CaptainsOffice.s
+++ b/data/text/maps/AbandonedShip_CaptainsOffice.s
diff --git a/data/maps/text/AbandonedShip_Corridors_1F.s b/data/text/maps/AbandonedShip_Corridors_1F.s
index 9a96e04f9..9a96e04f9 100644
--- a/data/maps/text/AbandonedShip_Corridors_1F.s
+++ b/data/text/maps/AbandonedShip_Corridors_1F.s
diff --git a/data/maps/text/AbandonedShip_Corridors_B1F.s b/data/text/maps/AbandonedShip_Corridors_B1F.s
index 887a6c11a..887a6c11a 100644
--- a/data/maps/text/AbandonedShip_Corridors_B1F.s
+++ b/data/text/maps/AbandonedShip_Corridors_B1F.s
diff --git a/data/maps/text/AbandonedShip_HiddenFloorCorridors.s b/data/text/maps/AbandonedShip_HiddenFloorCorridors.s
index 8e43b2462..8e43b2462 100644
--- a/data/maps/text/AbandonedShip_HiddenFloorCorridors.s
+++ b/data/text/maps/AbandonedShip_HiddenFloorCorridors.s
diff --git a/data/maps/text/AbandonedShip_HiddenFloorRooms.s b/data/text/maps/AbandonedShip_HiddenFloorRooms.s
index 1be9f8f02..1be9f8f02 100644
--- a/data/maps/text/AbandonedShip_HiddenFloorRooms.s
+++ b/data/text/maps/AbandonedShip_HiddenFloorRooms.s
diff --git a/data/maps/text/AbandonedShip_Rooms2_1F.s b/data/text/maps/AbandonedShip_Rooms2_1F.s
index d7fce3236..d7fce3236 100644
--- a/data/maps/text/AbandonedShip_Rooms2_1F.s
+++ b/data/text/maps/AbandonedShip_Rooms2_1F.s
diff --git a/data/maps/text/AbandonedShip_Rooms2_B1F.s b/data/text/maps/AbandonedShip_Rooms2_B1F.s
index 7e868b335..7e868b335 100644
--- a/data/maps/text/AbandonedShip_Rooms2_B1F.s
+++ b/data/text/maps/AbandonedShip_Rooms2_B1F.s
diff --git a/data/maps/text/AbandonedShip_Rooms_1F.s b/data/text/maps/AbandonedShip_Rooms_1F.s
index f6e5c729f..f6e5c729f 100644
--- a/data/maps/text/AbandonedShip_Rooms_1F.s
+++ b/data/text/maps/AbandonedShip_Rooms_1F.s
diff --git a/data/maps/text/AbandonedShip_Rooms_B1F.s b/data/text/maps/AbandonedShip_Rooms_B1F.s
index 9ecf30a2b..9ecf30a2b 100644
--- a/data/maps/text/AbandonedShip_Rooms_B1F.s
+++ b/data/text/maps/AbandonedShip_Rooms_B1F.s
diff --git a/data/maps/text/AncientTomb.s b/data/text/maps/AncientTomb.s
index ca85352f0..ca85352f0 100644
--- a/data/maps/text/AncientTomb.s
+++ b/data/text/maps/AncientTomb.s
diff --git a/data/maps/text/AquaHideout_1F.s b/data/text/maps/AquaHideout_1F.s
index f5539e687..f5539e687 100644
--- a/data/maps/text/AquaHideout_1F.s
+++ b/data/text/maps/AquaHideout_1F.s
diff --git a/data/maps/text/AquaHideout_B1F.s b/data/text/maps/AquaHideout_B1F.s
index f62c08e76..f62c08e76 100644
--- a/data/maps/text/AquaHideout_B1F.s
+++ b/data/text/maps/AquaHideout_B1F.s
diff --git a/data/maps/text/AquaHideout_B2F.s b/data/text/maps/AquaHideout_B2F.s
index 230afe36c..230afe36c 100644
--- a/data/maps/text/AquaHideout_B2F.s
+++ b/data/text/maps/AquaHideout_B2F.s
diff --git a/data/maps/text/BattleTower_BattleRoom.s b/data/text/maps/BattleTower_BattleRoom.s
index f78ffcc81..f78ffcc81 100644
--- a/data/maps/text/BattleTower_BattleRoom.s
+++ b/data/text/maps/BattleTower_BattleRoom.s
diff --git a/data/maps/text/BattleTower_Lobby.s b/data/text/maps/BattleTower_Lobby.s
index 832041e86..832041e86 100644
--- a/data/maps/text/BattleTower_Lobby.s
+++ b/data/text/maps/BattleTower_Lobby.s
diff --git a/data/maps/text/BattleTower_Outside.s b/data/text/maps/BattleTower_Outside.s
index ef8be00de..ef8be00de 100644
--- a/data/maps/text/BattleTower_Outside.s
+++ b/data/text/maps/BattleTower_Outside.s
diff --git a/data/maps/text/CaveOfOrigin_B4F.s b/data/text/maps/CaveOfOrigin_B4F.s
index 6d59f8971..6d59f8971 100644
--- a/data/maps/text/CaveOfOrigin_B4F.s
+++ b/data/text/maps/CaveOfOrigin_B4F.s
diff --git a/data/maps/text/DesertRuins.s b/data/text/maps/DesertRuins.s
index 528e4c8e2..528e4c8e2 100644
--- a/data/maps/text/DesertRuins.s
+++ b/data/text/maps/DesertRuins.s
diff --git a/data/maps/text/DewfordTown.s b/data/text/maps/DewfordTown.s
index a39dcc4c2..a39dcc4c2 100644
--- a/data/maps/text/DewfordTown.s
+++ b/data/text/maps/DewfordTown.s
diff --git a/data/maps/text/DewfordTown_Gym.s b/data/text/maps/DewfordTown_Gym.s
index 904e6c338..904e6c338 100644
--- a/data/maps/text/DewfordTown_Gym.s
+++ b/data/text/maps/DewfordTown_Gym.s
diff --git a/data/maps/text/DewfordTown_Hall.s b/data/text/maps/DewfordTown_Hall.s
index 6023984a4..6023984a4 100644
--- a/data/maps/text/DewfordTown_Hall.s
+++ b/data/text/maps/DewfordTown_Hall.s
diff --git a/data/maps/text/DewfordTown_House1.s b/data/text/maps/DewfordTown_House1.s
index 8f6324636..8f6324636 100644
--- a/data/maps/text/DewfordTown_House1.s
+++ b/data/text/maps/DewfordTown_House1.s
diff --git a/data/maps/text/DewfordTown_House2.s b/data/text/maps/DewfordTown_House2.s
index daa41a12c..daa41a12c 100644
--- a/data/maps/text/DewfordTown_House2.s
+++ b/data/text/maps/DewfordTown_House2.s
diff --git a/data/maps/text/DewfordTown_PokemonCenter_1F.s b/data/text/maps/DewfordTown_PokemonCenter_1F.s
index de56f404e..de56f404e 100644
--- a/data/maps/text/DewfordTown_PokemonCenter_1F.s
+++ b/data/text/maps/DewfordTown_PokemonCenter_1F.s
diff --git a/data/maps/text/EverGrandeCity.s b/data/text/maps/EverGrandeCity.s
index 31e53ef90..31e53ef90 100644
--- a/data/maps/text/EverGrandeCity.s
+++ b/data/text/maps/EverGrandeCity.s
diff --git a/data/maps/text/EverGrandeCity_ChampionsRoom.s b/data/text/maps/EverGrandeCity_ChampionsRoom.s
index 82ccb7e4f..82ccb7e4f 100644
--- a/data/maps/text/EverGrandeCity_ChampionsRoom.s
+++ b/data/text/maps/EverGrandeCity_ChampionsRoom.s
diff --git a/data/maps/text/EverGrandeCity_DrakesRoom.s b/data/text/maps/EverGrandeCity_DrakesRoom.s
index d3c83c885..d3c83c885 100644
--- a/data/maps/text/EverGrandeCity_DrakesRoom.s
+++ b/data/text/maps/EverGrandeCity_DrakesRoom.s
diff --git a/data/maps/text/EverGrandeCity_GlaciasRoom.s b/data/text/maps/EverGrandeCity_GlaciasRoom.s
index a25070dca..a25070dca 100644
--- a/data/maps/text/EverGrandeCity_GlaciasRoom.s
+++ b/data/text/maps/EverGrandeCity_GlaciasRoom.s
diff --git a/data/maps/text/EverGrandeCity_HallOfFame.s b/data/text/maps/EverGrandeCity_HallOfFame.s
index 5b6701471..5b6701471 100644
--- a/data/maps/text/EverGrandeCity_HallOfFame.s
+++ b/data/text/maps/EverGrandeCity_HallOfFame.s
diff --git a/data/maps/text/EverGrandeCity_PhoebesRoom.s b/data/text/maps/EverGrandeCity_PhoebesRoom.s
index 047390a95..047390a95 100644
--- a/data/maps/text/EverGrandeCity_PhoebesRoom.s
+++ b/data/text/maps/EverGrandeCity_PhoebesRoom.s
diff --git a/data/maps/text/EverGrandeCity_PokemonCenter_1F.s b/data/text/maps/EverGrandeCity_PokemonCenter_1F.s
index 767e24696..767e24696 100644
--- a/data/maps/text/EverGrandeCity_PokemonCenter_1F.s
+++ b/data/text/maps/EverGrandeCity_PokemonCenter_1F.s
diff --git a/data/maps/text/EverGrandeCity_PokemonLeague.s b/data/text/maps/EverGrandeCity_PokemonLeague.s
index 3d5c5fa1f..3d5c5fa1f 100644
--- a/data/maps/text/EverGrandeCity_PokemonLeague.s
+++ b/data/text/maps/EverGrandeCity_PokemonLeague.s
diff --git a/data/maps/text/EverGrandeCity_SidneysRoom.s b/data/text/maps/EverGrandeCity_SidneysRoom.s
index 6ec9f3327..6ec9f3327 100644
--- a/data/maps/text/EverGrandeCity_SidneysRoom.s
+++ b/data/text/maps/EverGrandeCity_SidneysRoom.s
diff --git a/data/maps/text/FallarborTown.s b/data/text/maps/FallarborTown.s
index 6bb2b38e0..6bb2b38e0 100644
--- a/data/maps/text/FallarborTown.s
+++ b/data/text/maps/FallarborTown.s
diff --git a/data/maps/text/FallarborTown_ContestHall.s b/data/text/maps/FallarborTown_ContestHall.s
index a9ff40989..a9ff40989 100644
--- a/data/maps/text/FallarborTown_ContestHall.s
+++ b/data/text/maps/FallarborTown_ContestHall.s
diff --git a/data/maps/text/FallarborTown_ContestLobby.s b/data/text/maps/FallarborTown_ContestLobby.s
index 58a1116d1..58a1116d1 100644
--- a/data/maps/text/FallarborTown_ContestLobby.s
+++ b/data/text/maps/FallarborTown_ContestLobby.s
diff --git a/data/maps/text/FallarborTown_House1.s b/data/text/maps/FallarborTown_House1.s
index d01357fa2..d01357fa2 100644
--- a/data/maps/text/FallarborTown_House1.s
+++ b/data/text/maps/FallarborTown_House1.s
diff --git a/data/maps/text/FallarborTown_House2.s b/data/text/maps/FallarborTown_House2.s
index 32f430dd9..32f430dd9 100644
--- a/data/maps/text/FallarborTown_House2.s
+++ b/data/text/maps/FallarborTown_House2.s
diff --git a/data/maps/text/FallarborTown_Mart.s b/data/text/maps/FallarborTown_Mart.s
index a83d94a9f..a83d94a9f 100644
--- a/data/maps/text/FallarborTown_Mart.s
+++ b/data/text/maps/FallarborTown_Mart.s
diff --git a/data/maps/text/FallarborTown_PokemonCenter_1F.s b/data/text/maps/FallarborTown_PokemonCenter_1F.s
index 8c3f8886e..8c3f8886e 100644
--- a/data/maps/text/FallarborTown_PokemonCenter_1F.s
+++ b/data/text/maps/FallarborTown_PokemonCenter_1F.s
diff --git a/data/maps/text/FortreeCity.s b/data/text/maps/FortreeCity.s
index 873c61066..873c61066 100644
--- a/data/maps/text/FortreeCity.s
+++ b/data/text/maps/FortreeCity.s
diff --git a/data/maps/text/FortreeCity_DecorationShop.s b/data/text/maps/FortreeCity_DecorationShop.s
index d977d0e35..d977d0e35 100644
--- a/data/maps/text/FortreeCity_DecorationShop.s
+++ b/data/text/maps/FortreeCity_DecorationShop.s
diff --git a/data/maps/text/FortreeCity_Gym.s b/data/text/maps/FortreeCity_Gym.s
index 1c8d5c55d..1c8d5c55d 100644
--- a/data/maps/text/FortreeCity_Gym.s
+++ b/data/text/maps/FortreeCity_Gym.s
diff --git a/data/maps/text/FortreeCity_House1.s b/data/text/maps/FortreeCity_House1.s
index 605d9a842..605d9a842 100644
--- a/data/maps/text/FortreeCity_House1.s
+++ b/data/text/maps/FortreeCity_House1.s
diff --git a/data/maps/text/FortreeCity_House2.s b/data/text/maps/FortreeCity_House2.s
index 60ee2442f..60ee2442f 100644
--- a/data/maps/text/FortreeCity_House2.s
+++ b/data/text/maps/FortreeCity_House2.s
diff --git a/data/maps/text/FortreeCity_House3.s b/data/text/maps/FortreeCity_House3.s
index a4705366d..a4705366d 100644
--- a/data/maps/text/FortreeCity_House3.s
+++ b/data/text/maps/FortreeCity_House3.s
diff --git a/data/maps/text/FortreeCity_House4.s b/data/text/maps/FortreeCity_House4.s
index 7673409b8..7673409b8 100644
--- a/data/maps/text/FortreeCity_House4.s
+++ b/data/text/maps/FortreeCity_House4.s
diff --git a/data/maps/text/FortreeCity_House5.s b/data/text/maps/FortreeCity_House5.s
index 4d35b3a7b..4d35b3a7b 100644
--- a/data/maps/text/FortreeCity_House5.s
+++ b/data/text/maps/FortreeCity_House5.s
diff --git a/data/maps/text/FortreeCity_Mart.s b/data/text/maps/FortreeCity_Mart.s
index 9f12492a1..9f12492a1 100644
--- a/data/maps/text/FortreeCity_Mart.s
+++ b/data/text/maps/FortreeCity_Mart.s
diff --git a/data/maps/text/FortreeCity_PokemonCenter_1F.s b/data/text/maps/FortreeCity_PokemonCenter_1F.s
index 7ce6d3c3f..7ce6d3c3f 100644
--- a/data/maps/text/FortreeCity_PokemonCenter_1F.s
+++ b/data/text/maps/FortreeCity_PokemonCenter_1F.s
diff --git a/data/maps/text/GraniteCave_1F.s b/data/text/maps/GraniteCave_1F.s
index a2f1257fb..a2f1257fb 100644
--- a/data/maps/text/GraniteCave_1F.s
+++ b/data/text/maps/GraniteCave_1F.s
diff --git a/data/maps/text/GraniteCave_StevensRoom.s b/data/text/maps/GraniteCave_StevensRoom.s
index 78e74a984..78e74a984 100644
--- a/data/maps/text/GraniteCave_StevensRoom.s
+++ b/data/text/maps/GraniteCave_StevensRoom.s
diff --git a/data/maps/text/InsideOfTruck.s b/data/text/maps/InsideOfTruck.s
index e4d4ada90..e4d4ada90 100644
--- a/data/maps/text/InsideOfTruck.s
+++ b/data/text/maps/InsideOfTruck.s
diff --git a/data/maps/text/IslandCave.s b/data/text/maps/IslandCave.s
index 5722700dd..5722700dd 100644
--- a/data/maps/text/IslandCave.s
+++ b/data/text/maps/IslandCave.s
diff --git a/data/maps/text/JaggedPass.s b/data/text/maps/JaggedPass.s
index 9c9798959..9c9798959 100644
--- a/data/maps/text/JaggedPass.s
+++ b/data/text/maps/JaggedPass.s
diff --git a/data/maps/text/LavaridgeTown.s b/data/text/maps/LavaridgeTown.s
index dbd5fde24..dbd5fde24 100644
--- a/data/maps/text/LavaridgeTown.s
+++ b/data/text/maps/LavaridgeTown.s
diff --git a/data/maps/text/LavaridgeTown_Gym_1F.s b/data/text/maps/LavaridgeTown_Gym_1F.s
index 1a59a31da..1a59a31da 100644
--- a/data/maps/text/LavaridgeTown_Gym_1F.s
+++ b/data/text/maps/LavaridgeTown_Gym_1F.s
diff --git a/data/maps/text/LavaridgeTown_HerbShop.s b/data/text/maps/LavaridgeTown_HerbShop.s
index e3f3dd526..e3f3dd526 100644
--- a/data/maps/text/LavaridgeTown_HerbShop.s
+++ b/data/text/maps/LavaridgeTown_HerbShop.s
diff --git a/data/maps/text/LavaridgeTown_House.s b/data/text/maps/LavaridgeTown_House.s
index 7bd77210a..7bd77210a 100644
--- a/data/maps/text/LavaridgeTown_House.s
+++ b/data/text/maps/LavaridgeTown_House.s
diff --git a/data/maps/text/LavaridgeTown_Mart.s b/data/text/maps/LavaridgeTown_Mart.s
index 1f04a0dd8..1f04a0dd8 100644
--- a/data/maps/text/LavaridgeTown_Mart.s
+++ b/data/text/maps/LavaridgeTown_Mart.s
diff --git a/data/maps/text/LavaridgeTown_PokemonCenter_1F.s b/data/text/maps/LavaridgeTown_PokemonCenter_1F.s
index 6585b5219..6585b5219 100644
--- a/data/maps/text/LavaridgeTown_PokemonCenter_1F.s
+++ b/data/text/maps/LavaridgeTown_PokemonCenter_1F.s
diff --git a/data/maps/text/LilycoveCity.s b/data/text/maps/LilycoveCity.s
index 8ff35d572..8ff35d572 100644
--- a/data/maps/text/LilycoveCity.s
+++ b/data/text/maps/LilycoveCity.s
diff --git a/data/maps/text/LilycoveCity_ContestHall.s b/data/text/maps/LilycoveCity_ContestHall.s
index 99131eb71..99131eb71 100644
--- a/data/maps/text/LilycoveCity_ContestHall.s
+++ b/data/text/maps/LilycoveCity_ContestHall.s
diff --git a/data/maps/text/LilycoveCity_ContestLobby.s b/data/text/maps/LilycoveCity_ContestLobby.s
index d173519e8..d173519e8 100644
--- a/data/maps/text/LilycoveCity_ContestLobby.s
+++ b/data/text/maps/LilycoveCity_ContestLobby.s
diff --git a/data/maps/text/LilycoveCity_CoveLilyMotel_1F.s b/data/text/maps/LilycoveCity_CoveLilyMotel_1F.s
index 0ecfd290b..0ecfd290b 100644
--- a/data/maps/text/LilycoveCity_CoveLilyMotel_1F.s
+++ b/data/text/maps/LilycoveCity_CoveLilyMotel_1F.s
diff --git a/data/maps/text/LilycoveCity_CoveLilyMotel_2F.s b/data/text/maps/LilycoveCity_CoveLilyMotel_2F.s
index 4aac25329..4aac25329 100644
--- a/data/maps/text/LilycoveCity_CoveLilyMotel_2F.s
+++ b/data/text/maps/LilycoveCity_CoveLilyMotel_2F.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStoreElevator.s b/data/text/maps/LilycoveCity_DepartmentStoreElevator.s
index 8c7826d44..8c7826d44 100644
--- a/data/maps/text/LilycoveCity_DepartmentStoreElevator.s
+++ b/data/text/maps/LilycoveCity_DepartmentStoreElevator.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStoreRooftop.s b/data/text/maps/LilycoveCity_DepartmentStoreRooftop.s
index cc788cb16..cc788cb16 100644
--- a/data/maps/text/LilycoveCity_DepartmentStoreRooftop.s
+++ b/data/text/maps/LilycoveCity_DepartmentStoreRooftop.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStore_1F.s b/data/text/maps/LilycoveCity_DepartmentStore_1F.s
index b4f34f2c3..b4f34f2c3 100644
--- a/data/maps/text/LilycoveCity_DepartmentStore_1F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_1F.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStore_2F.s b/data/text/maps/LilycoveCity_DepartmentStore_2F.s
index 3b4271ca7..3b4271ca7 100644
--- a/data/maps/text/LilycoveCity_DepartmentStore_2F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_2F.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStore_3F.s b/data/text/maps/LilycoveCity_DepartmentStore_3F.s
index baecfcecf..baecfcecf 100644
--- a/data/maps/text/LilycoveCity_DepartmentStore_3F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_3F.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStore_4F.s b/data/text/maps/LilycoveCity_DepartmentStore_4F.s
index 7cfa099ea..7cfa099ea 100644
--- a/data/maps/text/LilycoveCity_DepartmentStore_4F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_4F.s
diff --git a/data/maps/text/LilycoveCity_DepartmentStore_5F.s b/data/text/maps/LilycoveCity_DepartmentStore_5F.s
index c1e3975cb..c1e3975cb 100644
--- a/data/maps/text/LilycoveCity_DepartmentStore_5F.s
+++ b/data/text/maps/LilycoveCity_DepartmentStore_5F.s
diff --git a/data/maps/text/LilycoveCity_Harbor.s b/data/text/maps/LilycoveCity_Harbor.s
index 8b30a1ec0..8b30a1ec0 100644
--- a/data/maps/text/LilycoveCity_Harbor.s
+++ b/data/text/maps/LilycoveCity_Harbor.s
diff --git a/data/maps/text/LilycoveCity_House1.s b/data/text/maps/LilycoveCity_House1.s
index b70a063ee..b70a063ee 100644
--- a/data/maps/text/LilycoveCity_House1.s
+++ b/data/text/maps/LilycoveCity_House1.s
diff --git a/data/maps/text/LilycoveCity_House2.s b/data/text/maps/LilycoveCity_House2.s
index c50013bf8..c50013bf8 100644
--- a/data/maps/text/LilycoveCity_House2.s
+++ b/data/text/maps/LilycoveCity_House2.s
diff --git a/data/maps/text/LilycoveCity_House3.s b/data/text/maps/LilycoveCity_House3.s
index bb20e610f..bb20e610f 100644
--- a/data/maps/text/LilycoveCity_House3.s
+++ b/data/text/maps/LilycoveCity_House3.s
diff --git a/data/maps/text/LilycoveCity_House4.s b/data/text/maps/LilycoveCity_House4.s
index 62b00b418..62b00b418 100644
--- a/data/maps/text/LilycoveCity_House4.s
+++ b/data/text/maps/LilycoveCity_House4.s
diff --git a/data/maps/text/LilycoveCity_LilycoveMuseum_1F.s b/data/text/maps/LilycoveCity_LilycoveMuseum_1F.s
index c8770999f..c8770999f 100644
--- a/data/maps/text/LilycoveCity_LilycoveMuseum_1F.s
+++ b/data/text/maps/LilycoveCity_LilycoveMuseum_1F.s
diff --git a/data/maps/text/LilycoveCity_LilycoveMuseum_2F.s b/data/text/maps/LilycoveCity_LilycoveMuseum_2F.s
index 65d4f6700..65d4f6700 100644
--- a/data/maps/text/LilycoveCity_LilycoveMuseum_2F.s
+++ b/data/text/maps/LilycoveCity_LilycoveMuseum_2F.s
diff --git a/data/maps/text/LilycoveCity_MoveDeletersHouse.s b/data/text/maps/LilycoveCity_MoveDeletersHouse.s
index 532aa6cc4..532aa6cc4 100644
--- a/data/maps/text/LilycoveCity_MoveDeletersHouse.s
+++ b/data/text/maps/LilycoveCity_MoveDeletersHouse.s
diff --git a/data/maps/text/LilycoveCity_PokemonCenter_1F.s b/data/text/maps/LilycoveCity_PokemonCenter_1F.s
index b9a43f2e1..b9a43f2e1 100644
--- a/data/maps/text/LilycoveCity_PokemonCenter_1F.s
+++ b/data/text/maps/LilycoveCity_PokemonCenter_1F.s
diff --git a/data/maps/text/LilycoveCity_PokemonTrainerFanClub.s b/data/text/maps/LilycoveCity_PokemonTrainerFanClub.s
index c40892c52..c40892c52 100644
--- a/data/maps/text/LilycoveCity_PokemonTrainerFanClub.s
+++ b/data/text/maps/LilycoveCity_PokemonTrainerFanClub.s
diff --git a/data/maps/text/LinkContestRoom1.s b/data/text/maps/LinkContestRoom1.s
index a3f3c2a53..a3f3c2a53 100644
--- a/data/maps/text/LinkContestRoom1.s
+++ b/data/text/maps/LinkContestRoom1.s
diff --git a/data/maps/text/LittlerootTown.s b/data/text/maps/LittlerootTown.s
index 7ae7cf9af..7ae7cf9af 100644
--- a/data/maps/text/LittlerootTown.s
+++ b/data/text/maps/LittlerootTown.s
diff --git a/data/maps/text/LittlerootTown_BrendansHouse_1F.s b/data/text/maps/LittlerootTown_BrendansHouse_1F.s
index 888fc8973..888fc8973 100644
--- a/data/maps/text/LittlerootTown_BrendansHouse_1F.s
+++ b/data/text/maps/LittlerootTown_BrendansHouse_1F.s
diff --git a/data/maps/text/LittlerootTown_BrendansHouse_2F.s b/data/text/maps/LittlerootTown_BrendansHouse_2F.s
index e12500ca9..e12500ca9 100644
--- a/data/maps/text/LittlerootTown_BrendansHouse_2F.s
+++ b/data/text/maps/LittlerootTown_BrendansHouse_2F.s
diff --git a/data/maps/text/LittlerootTown_MaysHouse_1F.s b/data/text/maps/LittlerootTown_MaysHouse_1F.s
index aef905854..aef905854 100644
--- a/data/maps/text/LittlerootTown_MaysHouse_1F.s
+++ b/data/text/maps/LittlerootTown_MaysHouse_1F.s
diff --git a/data/maps/text/LittlerootTown_MaysHouse_2F.s b/data/text/maps/LittlerootTown_MaysHouse_2F.s
index a63675bce..a63675bce 100644
--- a/data/maps/text/LittlerootTown_MaysHouse_2F.s
+++ b/data/text/maps/LittlerootTown_MaysHouse_2F.s
diff --git a/data/maps/text/LittlerootTown_ProfessorBirchsLab.s b/data/text/maps/LittlerootTown_ProfessorBirchsLab.s
index 28dd5b31f..28dd5b31f 100644
--- a/data/maps/text/LittlerootTown_ProfessorBirchsLab.s
+++ b/data/text/maps/LittlerootTown_ProfessorBirchsLab.s
diff --git a/data/maps/text/MauvilleCity.s b/data/text/maps/MauvilleCity.s
index f72dd5be1..f72dd5be1 100644
--- a/data/maps/text/MauvilleCity.s
+++ b/data/text/maps/MauvilleCity.s
diff --git a/data/maps/text/MauvilleCity_BikeShop.s b/data/text/maps/MauvilleCity_BikeShop.s
index 3bdb594b9..3bdb594b9 100644
--- a/data/maps/text/MauvilleCity_BikeShop.s
+++ b/data/text/maps/MauvilleCity_BikeShop.s
diff --git a/data/maps/text/MauvilleCity_GameCorner.s b/data/text/maps/MauvilleCity_GameCorner.s
index 00eb1368c..00eb1368c 100644
--- a/data/maps/text/MauvilleCity_GameCorner.s
+++ b/data/text/maps/MauvilleCity_GameCorner.s
diff --git a/data/maps/text/MauvilleCity_Gym.s b/data/text/maps/MauvilleCity_Gym.s
index c143e2281..c143e2281 100644
--- a/data/maps/text/MauvilleCity_Gym.s
+++ b/data/text/maps/MauvilleCity_Gym.s
diff --git a/data/maps/text/MauvilleCity_House1.s b/data/text/maps/MauvilleCity_House1.s
index 60f44c47d..60f44c47d 100644
--- a/data/maps/text/MauvilleCity_House1.s
+++ b/data/text/maps/MauvilleCity_House1.s
diff --git a/data/maps/text/MauvilleCity_House2.s b/data/text/maps/MauvilleCity_House2.s
index 8d2053b33..8d2053b33 100644
--- a/data/maps/text/MauvilleCity_House2.s
+++ b/data/text/maps/MauvilleCity_House2.s
diff --git a/data/maps/text/MauvilleCity_Mart.s b/data/text/maps/MauvilleCity_Mart.s
index 63d02b551..63d02b551 100644
--- a/data/maps/text/MauvilleCity_Mart.s
+++ b/data/text/maps/MauvilleCity_Mart.s
diff --git a/data/maps/text/MauvilleCity_PokemonCenter_1F.s b/data/text/maps/MauvilleCity_PokemonCenter_1F.s
index 797dc87d5..797dc87d5 100644
--- a/data/maps/text/MauvilleCity_PokemonCenter_1F.s
+++ b/data/text/maps/MauvilleCity_PokemonCenter_1F.s
diff --git a/data/maps/text/MauvilleCity_PokemonCenter_2F.s b/data/text/maps/MauvilleCity_PokemonCenter_2F.s
index 68296bb2d..68296bb2d 100644
--- a/data/maps/text/MauvilleCity_PokemonCenter_2F.s
+++ b/data/text/maps/MauvilleCity_PokemonCenter_2F.s
diff --git a/data/maps/text/MeteorFalls_1F_1R.s b/data/text/maps/MeteorFalls_1F_1R.s
index 788d692c4..788d692c4 100644
--- a/data/maps/text/MeteorFalls_1F_1R.s
+++ b/data/text/maps/MeteorFalls_1F_1R.s
diff --git a/data/maps/text/MeteorFalls_1F_2R.s b/data/text/maps/MeteorFalls_1F_2R.s
index a260ce9ef..a260ce9ef 100644
--- a/data/maps/text/MeteorFalls_1F_2R.s
+++ b/data/text/maps/MeteorFalls_1F_2R.s
diff --git a/data/maps/text/MossdeepCity.s b/data/text/maps/MossdeepCity.s
index 9bdcf3b3c..9bdcf3b3c 100644
--- a/data/maps/text/MossdeepCity.s
+++ b/data/text/maps/MossdeepCity.s
diff --git a/data/maps/text/MossdeepCity_GameCorner_1F.s b/data/text/maps/MossdeepCity_GameCorner_1F.s
index 7324999c8..7324999c8 100644
--- a/data/maps/text/MossdeepCity_GameCorner_1F.s
+++ b/data/text/maps/MossdeepCity_GameCorner_1F.s
diff --git a/data/maps/text/MossdeepCity_GameCorner_B1F.s b/data/text/maps/MossdeepCity_GameCorner_B1F.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/MossdeepCity_GameCorner_B1F.s
+++ b/data/text/maps/MossdeepCity_GameCorner_B1F.s
diff --git a/data/maps/text/MossdeepCity_Gym.s b/data/text/maps/MossdeepCity_Gym.s
index 4bb63b01a..4bb63b01a 100644
--- a/data/maps/text/MossdeepCity_Gym.s
+++ b/data/text/maps/MossdeepCity_Gym.s
diff --git a/data/maps/text/MossdeepCity_House1.s b/data/text/maps/MossdeepCity_House1.s
index 81a6194bd..81a6194bd 100644
--- a/data/maps/text/MossdeepCity_House1.s
+++ b/data/text/maps/MossdeepCity_House1.s
diff --git a/data/maps/text/MossdeepCity_House2.s b/data/text/maps/MossdeepCity_House2.s
index 74bf1fa22..74bf1fa22 100644
--- a/data/maps/text/MossdeepCity_House2.s
+++ b/data/text/maps/MossdeepCity_House2.s
diff --git a/data/maps/text/MossdeepCity_House3.s b/data/text/maps/MossdeepCity_House3.s
index e4b8779ce..e4b8779ce 100644
--- a/data/maps/text/MossdeepCity_House3.s
+++ b/data/text/maps/MossdeepCity_House3.s
diff --git a/data/maps/text/MossdeepCity_House4.s b/data/text/maps/MossdeepCity_House4.s
index ab9106da6..ab9106da6 100644
--- a/data/maps/text/MossdeepCity_House4.s
+++ b/data/text/maps/MossdeepCity_House4.s
diff --git a/data/maps/text/MossdeepCity_Mart.s b/data/text/maps/MossdeepCity_Mart.s
index fec3149ce..fec3149ce 100644
--- a/data/maps/text/MossdeepCity_Mart.s
+++ b/data/text/maps/MossdeepCity_Mart.s
diff --git a/data/maps/text/MossdeepCity_PokemonCenter_1F.s b/data/text/maps/MossdeepCity_PokemonCenter_1F.s
index d9f42b3a1..d9f42b3a1 100644
--- a/data/maps/text/MossdeepCity_PokemonCenter_1F.s
+++ b/data/text/maps/MossdeepCity_PokemonCenter_1F.s
diff --git a/data/maps/text/MossdeepCity_PokemonCenter_2F.s b/data/text/maps/MossdeepCity_PokemonCenter_2F.s
index 486d36d76..486d36d76 100644
--- a/data/maps/text/MossdeepCity_PokemonCenter_2F.s
+++ b/data/text/maps/MossdeepCity_PokemonCenter_2F.s
diff --git a/data/maps/text/MossdeepCity_SpaceCenter_1F.s b/data/text/maps/MossdeepCity_SpaceCenter_1F.s
index 23f544099..23f544099 100644
--- a/data/maps/text/MossdeepCity_SpaceCenter_1F.s
+++ b/data/text/maps/MossdeepCity_SpaceCenter_1F.s
diff --git a/data/maps/text/MossdeepCity_SpaceCenter_2F.s b/data/text/maps/MossdeepCity_SpaceCenter_2F.s
index fdaf8d0a5..fdaf8d0a5 100644
--- a/data/maps/text/MossdeepCity_SpaceCenter_2F.s
+++ b/data/text/maps/MossdeepCity_SpaceCenter_2F.s
diff --git a/data/maps/text/MossdeepCity_StevensHouse.s b/data/text/maps/MossdeepCity_StevensHouse.s
index b05b557b8..b05b557b8 100644
--- a/data/maps/text/MossdeepCity_StevensHouse.s
+++ b/data/text/maps/MossdeepCity_StevensHouse.s
diff --git a/data/maps/text/MtChimney.s b/data/text/maps/MtChimney.s
index 3c033fe0c..3c033fe0c 100644
--- a/data/maps/text/MtChimney.s
+++ b/data/text/maps/MtChimney.s
diff --git a/data/maps/text/MtChimney_CableCarStation.s b/data/text/maps/MtChimney_CableCarStation.s
index 03e2f7a2a..03e2f7a2a 100644
--- a/data/maps/text/MtChimney_CableCarStation.s
+++ b/data/text/maps/MtChimney_CableCarStation.s
diff --git a/data/maps/text/MtPyre_1F.s b/data/text/maps/MtPyre_1F.s
index ff17f173e..ff17f173e 100644
--- a/data/maps/text/MtPyre_1F.s
+++ b/data/text/maps/MtPyre_1F.s
diff --git a/data/maps/text/MtPyre_2F.s b/data/text/maps/MtPyre_2F.s
index f98b916d5..f98b916d5 100644
--- a/data/maps/text/MtPyre_2F.s
+++ b/data/text/maps/MtPyre_2F.s
diff --git a/data/maps/text/MtPyre_3F.s b/data/text/maps/MtPyre_3F.s
index 3eb54cc99..3eb54cc99 100644
--- a/data/maps/text/MtPyre_3F.s
+++ b/data/text/maps/MtPyre_3F.s
diff --git a/data/maps/text/MtPyre_4F.s b/data/text/maps/MtPyre_4F.s
index e1f539cdc..e1f539cdc 100644
--- a/data/maps/text/MtPyre_4F.s
+++ b/data/text/maps/MtPyre_4F.s
diff --git a/data/maps/text/MtPyre_5F.s b/data/text/maps/MtPyre_5F.s
index 9830042f9..9830042f9 100644
--- a/data/maps/text/MtPyre_5F.s
+++ b/data/text/maps/MtPyre_5F.s
diff --git a/data/maps/text/MtPyre_6F.s b/data/text/maps/MtPyre_6F.s
index de30577bc..de30577bc 100644
--- a/data/maps/text/MtPyre_6F.s
+++ b/data/text/maps/MtPyre_6F.s
diff --git a/data/maps/text/MtPyre_Summit.s b/data/text/maps/MtPyre_Summit.s
index 1c2e6be8a..1c2e6be8a 100644
--- a/data/maps/text/MtPyre_Summit.s
+++ b/data/text/maps/MtPyre_Summit.s
diff --git a/data/maps/text/NewMauville_Entrance.s b/data/text/maps/NewMauville_Entrance.s
index 070e9cdec..070e9cdec 100644
--- a/data/maps/text/NewMauville_Entrance.s
+++ b/data/text/maps/NewMauville_Entrance.s
diff --git a/data/maps/text/NewMauville_Inside.s b/data/text/maps/NewMauville_Inside.s
index 982e1a004..982e1a004 100644
--- a/data/maps/text/NewMauville_Inside.s
+++ b/data/text/maps/NewMauville_Inside.s
diff --git a/data/maps/text/OldaleTown.s b/data/text/maps/OldaleTown.s
index 349d9b480..349d9b480 100644
--- a/data/maps/text/OldaleTown.s
+++ b/data/text/maps/OldaleTown.s
diff --git a/data/maps/text/OldaleTown_House1.s b/data/text/maps/OldaleTown_House1.s
index f153339eb..f153339eb 100644
--- a/data/maps/text/OldaleTown_House1.s
+++ b/data/text/maps/OldaleTown_House1.s
diff --git a/data/maps/text/OldaleTown_House2.s b/data/text/maps/OldaleTown_House2.s
index a4cb72254..a4cb72254 100644
--- a/data/maps/text/OldaleTown_House2.s
+++ b/data/text/maps/OldaleTown_House2.s
diff --git a/data/maps/text/OldaleTown_Mart.s b/data/text/maps/OldaleTown_Mart.s
index 71e0a0513..71e0a0513 100644
--- a/data/maps/text/OldaleTown_Mart.s
+++ b/data/text/maps/OldaleTown_Mart.s
diff --git a/data/maps/text/OldaleTown_PokemonCenter_1F.s b/data/text/maps/OldaleTown_PokemonCenter_1F.s
index 5b3f1f674..5b3f1f674 100644
--- a/data/maps/text/OldaleTown_PokemonCenter_1F.s
+++ b/data/text/maps/OldaleTown_PokemonCenter_1F.s
diff --git a/data/maps/text/OldaleTown_PokemonCenter_2F.s b/data/text/maps/OldaleTown_PokemonCenter_2F.s
index 78a02ffbe..78a02ffbe 100644
--- a/data/maps/text/OldaleTown_PokemonCenter_2F.s
+++ b/data/text/maps/OldaleTown_PokemonCenter_2F.s
diff --git a/data/maps/text/PacifidlogTown.s b/data/text/maps/PacifidlogTown.s
index 9f67efa9e..9f67efa9e 100644
--- a/data/maps/text/PacifidlogTown.s
+++ b/data/text/maps/PacifidlogTown.s
diff --git a/data/maps/text/PacifidlogTown_House1.s b/data/text/maps/PacifidlogTown_House1.s
index 7c3e3afd4..7c3e3afd4 100644
--- a/data/maps/text/PacifidlogTown_House1.s
+++ b/data/text/maps/PacifidlogTown_House1.s
diff --git a/data/maps/text/PacifidlogTown_House2.s b/data/text/maps/PacifidlogTown_House2.s
index 0e56cea1c..0e56cea1c 100644
--- a/data/maps/text/PacifidlogTown_House2.s
+++ b/data/text/maps/PacifidlogTown_House2.s
diff --git a/data/maps/text/PacifidlogTown_House3.s b/data/text/maps/PacifidlogTown_House3.s
index 0dba3cca4..0dba3cca4 100644
--- a/data/maps/text/PacifidlogTown_House3.s
+++ b/data/text/maps/PacifidlogTown_House3.s
diff --git a/data/maps/text/PacifidlogTown_House4.s b/data/text/maps/PacifidlogTown_House4.s
index a5cb340f8..a5cb340f8 100644
--- a/data/maps/text/PacifidlogTown_House4.s
+++ b/data/text/maps/PacifidlogTown_House4.s
diff --git a/data/maps/text/PacifidlogTown_House5.s b/data/text/maps/PacifidlogTown_House5.s
index ece3aca2e..ece3aca2e 100644
--- a/data/maps/text/PacifidlogTown_House5.s
+++ b/data/text/maps/PacifidlogTown_House5.s
diff --git a/data/maps/text/PacifidlogTown_PokemonCenter_1F.s b/data/text/maps/PacifidlogTown_PokemonCenter_1F.s
index 6ded1de17..6ded1de17 100644
--- a/data/maps/text/PacifidlogTown_PokemonCenter_1F.s
+++ b/data/text/maps/PacifidlogTown_PokemonCenter_1F.s
diff --git a/data/maps/text/PetalburgCity.s b/data/text/maps/PetalburgCity.s
index 62b4423dc..62b4423dc 100644
--- a/data/maps/text/PetalburgCity.s
+++ b/data/text/maps/PetalburgCity.s
diff --git a/data/maps/text/PetalburgCity_Gym.s b/data/text/maps/PetalburgCity_Gym.s
index 715229880..715229880 100644
--- a/data/maps/text/PetalburgCity_Gym.s
+++ b/data/text/maps/PetalburgCity_Gym.s
diff --git a/data/maps/text/PetalburgCity_House1.s b/data/text/maps/PetalburgCity_House1.s
index c1cb09305..c1cb09305 100644
--- a/data/maps/text/PetalburgCity_House1.s
+++ b/data/text/maps/PetalburgCity_House1.s
diff --git a/data/maps/text/PetalburgCity_House2.s b/data/text/maps/PetalburgCity_House2.s
index b0eec582c..b0eec582c 100644
--- a/data/maps/text/PetalburgCity_House2.s
+++ b/data/text/maps/PetalburgCity_House2.s
diff --git a/data/maps/text/PetalburgCity_Mart.s b/data/text/maps/PetalburgCity_Mart.s
index 42dd9f329..42dd9f329 100644
--- a/data/maps/text/PetalburgCity_Mart.s
+++ b/data/text/maps/PetalburgCity_Mart.s
diff --git a/data/maps/text/PetalburgCity_PokemonCenter_1F.s b/data/text/maps/PetalburgCity_PokemonCenter_1F.s
index 63a203107..63a203107 100644
--- a/data/maps/text/PetalburgCity_PokemonCenter_1F.s
+++ b/data/text/maps/PetalburgCity_PokemonCenter_1F.s
diff --git a/data/maps/text/PetalburgCity_WallysHouse.s b/data/text/maps/PetalburgCity_WallysHouse.s
index 7a4e50ec8..7a4e50ec8 100644
--- a/data/maps/text/PetalburgCity_WallysHouse.s
+++ b/data/text/maps/PetalburgCity_WallysHouse.s
diff --git a/data/maps/text/PetalburgWoods.s b/data/text/maps/PetalburgWoods.s
index 6305d32c2..6305d32c2 100644
--- a/data/maps/text/PetalburgWoods.s
+++ b/data/text/maps/PetalburgWoods.s
diff --git a/data/maps/text/RecordCorner.s b/data/text/maps/RecordCorner.s
index 4ee9f975b..4ee9f975b 100644
--- a/data/maps/text/RecordCorner.s
+++ b/data/text/maps/RecordCorner.s
diff --git a/data/maps/text/Route101.s b/data/text/maps/Route101.s
index 1897cce4e..1897cce4e 100644
--- a/data/maps/text/Route101.s
+++ b/data/text/maps/Route101.s
diff --git a/data/maps/text/Route102.s b/data/text/maps/Route102.s
index cf367edc2..cf367edc2 100644
--- a/data/maps/text/Route102.s
+++ b/data/text/maps/Route102.s
diff --git a/data/maps/text/Route103.s b/data/text/maps/Route103.s
index 97ad26169..97ad26169 100644
--- a/data/maps/text/Route103.s
+++ b/data/text/maps/Route103.s
diff --git a/data/maps/text/Route104.s b/data/text/maps/Route104.s
index 95f70a7ec..95f70a7ec 100644
--- a/data/maps/text/Route104.s
+++ b/data/text/maps/Route104.s
diff --git a/data/maps/text/Route104_MrBrineysHouse.s b/data/text/maps/Route104_MrBrineysHouse.s
index f75c7a8a2..f75c7a8a2 100644
--- a/data/maps/text/Route104_MrBrineysHouse.s
+++ b/data/text/maps/Route104_MrBrineysHouse.s
diff --git a/data/maps/text/Route104_PrettyPetalFlowerShop.s b/data/text/maps/Route104_PrettyPetalFlowerShop.s
index 53a329108..53a329108 100644
--- a/data/maps/text/Route104_PrettyPetalFlowerShop.s
+++ b/data/text/maps/Route104_PrettyPetalFlowerShop.s
diff --git a/data/maps/text/Route104_Prototype.s b/data/text/maps/Route104_Prototype.s
index 59a71018f..59a71018f 100644
--- a/data/maps/text/Route104_Prototype.s
+++ b/data/text/maps/Route104_Prototype.s
diff --git a/data/maps/text/Route104_PrototypePrettyPetalFlowerShop.s b/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.s
index 0c3af5f1f..0c3af5f1f 100644
--- a/data/maps/text/Route104_PrototypePrettyPetalFlowerShop.s
+++ b/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.s
diff --git a/data/maps/text/Route105.s b/data/text/maps/Route105.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/Route105.s
+++ b/data/text/maps/Route105.s
diff --git a/data/maps/text/Route106.s b/data/text/maps/Route106.s
index 38e92c65d..38e92c65d 100644
--- a/data/maps/text/Route106.s
+++ b/data/text/maps/Route106.s
diff --git a/data/maps/text/Route107.s b/data/text/maps/Route107.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/Route107.s
+++ b/data/text/maps/Route107.s
diff --git a/data/maps/text/Route108.s b/data/text/maps/Route108.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/Route108.s
+++ b/data/text/maps/Route108.s
diff --git a/data/maps/text/Route109.s b/data/text/maps/Route109.s
index a86efa2c4..a86efa2c4 100644
--- a/data/maps/text/Route109.s
+++ b/data/text/maps/Route109.s
diff --git a/data/maps/text/Route109_SeashoreHouse.s b/data/text/maps/Route109_SeashoreHouse.s
index 59823f02c..59823f02c 100644
--- a/data/maps/text/Route109_SeashoreHouse.s
+++ b/data/text/maps/Route109_SeashoreHouse.s
diff --git a/data/maps/text/Route110.s b/data/text/maps/Route110.s
index 29fefe53e..29fefe53e 100644
--- a/data/maps/text/Route110.s
+++ b/data/text/maps/Route110.s
diff --git a/data/maps/text/Route110_SeasideCyclingRoadNorthEntrance.s b/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.s
index 8d5a0433e..8d5a0433e 100644
--- a/data/maps/text/Route110_SeasideCyclingRoadNorthEntrance.s
+++ b/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.s
diff --git a/data/maps/text/Route110_SeasideCyclingRoadSouthEntrance.s b/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.s
index 77bf90751..77bf90751 100644
--- a/data/maps/text/Route110_SeasideCyclingRoadSouthEntrance.s
+++ b/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.s
diff --git a/data/maps/text/Route110_TrickHouseEnd.s b/data/text/maps/Route110_TrickHouseEnd.s
index 9d8086d26..9d8086d26 100644
--- a/data/maps/text/Route110_TrickHouseEnd.s
+++ b/data/text/maps/Route110_TrickHouseEnd.s
diff --git a/data/maps/text/Route110_TrickHouseEntrance.s b/data/text/maps/Route110_TrickHouseEntrance.s
index 83f11ea5f..83f11ea5f 100644
--- a/data/maps/text/Route110_TrickHouseEntrance.s
+++ b/data/text/maps/Route110_TrickHouseEntrance.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle1.s b/data/text/maps/Route110_TrickHousePuzzle1.s
index 84208ead5..84208ead5 100644
--- a/data/maps/text/Route110_TrickHousePuzzle1.s
+++ b/data/text/maps/Route110_TrickHousePuzzle1.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle2.s b/data/text/maps/Route110_TrickHousePuzzle2.s
index 3b923be21..3b923be21 100644
--- a/data/maps/text/Route110_TrickHousePuzzle2.s
+++ b/data/text/maps/Route110_TrickHousePuzzle2.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle3.s b/data/text/maps/Route110_TrickHousePuzzle3.s
index 9daf76b7d..9daf76b7d 100644
--- a/data/maps/text/Route110_TrickHousePuzzle3.s
+++ b/data/text/maps/Route110_TrickHousePuzzle3.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle4.s b/data/text/maps/Route110_TrickHousePuzzle4.s
index ffb2cef06..ffb2cef06 100644
--- a/data/maps/text/Route110_TrickHousePuzzle4.s
+++ b/data/text/maps/Route110_TrickHousePuzzle4.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle5.s b/data/text/maps/Route110_TrickHousePuzzle5.s
index 586349a6a..586349a6a 100644
--- a/data/maps/text/Route110_TrickHousePuzzle5.s
+++ b/data/text/maps/Route110_TrickHousePuzzle5.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle6.s b/data/text/maps/Route110_TrickHousePuzzle6.s
index 4261a2797..4261a2797 100644
--- a/data/maps/text/Route110_TrickHousePuzzle6.s
+++ b/data/text/maps/Route110_TrickHousePuzzle6.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle7.s b/data/text/maps/Route110_TrickHousePuzzle7.s
index 7dcfd169c..7dcfd169c 100644
--- a/data/maps/text/Route110_TrickHousePuzzle7.s
+++ b/data/text/maps/Route110_TrickHousePuzzle7.s
diff --git a/data/maps/text/Route110_TrickHousePuzzle8.s b/data/text/maps/Route110_TrickHousePuzzle8.s
index fa5173969..fa5173969 100644
--- a/data/maps/text/Route110_TrickHousePuzzle8.s
+++ b/data/text/maps/Route110_TrickHousePuzzle8.s
diff --git a/data/maps/text/Route111.s b/data/text/maps/Route111.s
index 35ed597cb..35ed597cb 100644
--- a/data/maps/text/Route111.s
+++ b/data/text/maps/Route111.s
diff --git a/data/maps/text/Route111_OldLadysRestStop.s b/data/text/maps/Route111_OldLadysRestStop.s
index 05823893d..05823893d 100644
--- a/data/maps/text/Route111_OldLadysRestStop.s
+++ b/data/text/maps/Route111_OldLadysRestStop.s
diff --git a/data/maps/text/Route111_WinstrateFamilysHouse.s b/data/text/maps/Route111_WinstrateFamilysHouse.s
index a2fb85041..a2fb85041 100644
--- a/data/maps/text/Route111_WinstrateFamilysHouse.s
+++ b/data/text/maps/Route111_WinstrateFamilysHouse.s
diff --git a/data/maps/text/Route112.s b/data/text/maps/Route112.s
index 5171aecaa..5171aecaa 100644
--- a/data/maps/text/Route112.s
+++ b/data/text/maps/Route112.s
diff --git a/data/maps/text/Route112_CableCarStation.s b/data/text/maps/Route112_CableCarStation.s
index f7167299c..f7167299c 100644
--- a/data/maps/text/Route112_CableCarStation.s
+++ b/data/text/maps/Route112_CableCarStation.s
diff --git a/data/maps/text/Route113.s b/data/text/maps/Route113.s
index 8ececd771..8ececd771 100644
--- a/data/maps/text/Route113.s
+++ b/data/text/maps/Route113.s
diff --git a/data/maps/text/Route113_GlassWorkshop.s b/data/text/maps/Route113_GlassWorkshop.s
index e80f72d0e..e80f72d0e 100644
--- a/data/maps/text/Route113_GlassWorkshop.s
+++ b/data/text/maps/Route113_GlassWorkshop.s
diff --git a/data/maps/text/Route114.s b/data/text/maps/Route114.s
index 5190cac0c..5190cac0c 100644
--- a/data/maps/text/Route114.s
+++ b/data/text/maps/Route114.s
diff --git a/data/maps/text/Route114_FossilManiacsHouse.s b/data/text/maps/Route114_FossilManiacsHouse.s
index af2cb7c6a..af2cb7c6a 100644
--- a/data/maps/text/Route114_FossilManiacsHouse.s
+++ b/data/text/maps/Route114_FossilManiacsHouse.s
diff --git a/data/maps/text/Route114_FossilManiacsTunnel.s b/data/text/maps/Route114_FossilManiacsTunnel.s
index 03b30ada6..03b30ada6 100644
--- a/data/maps/text/Route114_FossilManiacsTunnel.s
+++ b/data/text/maps/Route114_FossilManiacsTunnel.s
diff --git a/data/maps/text/Route114_LanettesHouse.s b/data/text/maps/Route114_LanettesHouse.s
index 35ec3e86b..35ec3e86b 100644
--- a/data/maps/text/Route114_LanettesHouse.s
+++ b/data/text/maps/Route114_LanettesHouse.s
diff --git a/data/maps/text/Route115.s b/data/text/maps/Route115.s
index 8e88c74dd..8e88c74dd 100644
--- a/data/maps/text/Route115.s
+++ b/data/text/maps/Route115.s
diff --git a/data/maps/text/Route116.s b/data/text/maps/Route116.s
index 9106aa1a4..9106aa1a4 100644
--- a/data/maps/text/Route116.s
+++ b/data/text/maps/Route116.s
diff --git a/data/maps/text/Route116_TunnelersRestHouse.s b/data/text/maps/Route116_TunnelersRestHouse.s
index ea6f0e97b..ea6f0e97b 100644
--- a/data/maps/text/Route116_TunnelersRestHouse.s
+++ b/data/text/maps/Route116_TunnelersRestHouse.s
diff --git a/data/maps/text/Route117.s b/data/text/maps/Route117.s
index 37482d51a..37482d51a 100644
--- a/data/maps/text/Route117.s
+++ b/data/text/maps/Route117.s
diff --git a/data/maps/text/Route117_PokemonDayCare.s b/data/text/maps/Route117_PokemonDayCare.s
index 5445200cc..5445200cc 100644
--- a/data/maps/text/Route117_PokemonDayCare.s
+++ b/data/text/maps/Route117_PokemonDayCare.s
diff --git a/data/maps/text/Route118.s b/data/text/maps/Route118.s
index f6636cada..f6636cada 100644
--- a/data/maps/text/Route118.s
+++ b/data/text/maps/Route118.s
diff --git a/data/maps/text/Route119.s b/data/text/maps/Route119.s
index 6df6f5e79..6df6f5e79 100644
--- a/data/maps/text/Route119.s
+++ b/data/text/maps/Route119.s
diff --git a/data/maps/text/Route119_House.s b/data/text/maps/Route119_House.s
index df5b32895..df5b32895 100644
--- a/data/maps/text/Route119_House.s
+++ b/data/text/maps/Route119_House.s
diff --git a/data/maps/text/Route119_WeatherInstitute_1F.s b/data/text/maps/Route119_WeatherInstitute_1F.s
index 30dc66a17..30dc66a17 100644
--- a/data/maps/text/Route119_WeatherInstitute_1F.s
+++ b/data/text/maps/Route119_WeatherInstitute_1F.s
diff --git a/data/maps/text/Route119_WeatherInstitute_2F.s b/data/text/maps/Route119_WeatherInstitute_2F.s
index 3b00452a7..3b00452a7 100644
--- a/data/maps/text/Route119_WeatherInstitute_2F.s
+++ b/data/text/maps/Route119_WeatherInstitute_2F.s
diff --git a/data/maps/text/Route120.s b/data/text/maps/Route120.s
index adaf369b1..adaf369b1 100644
--- a/data/maps/text/Route120.s
+++ b/data/text/maps/Route120.s
diff --git a/data/maps/text/Route121.s b/data/text/maps/Route121.s
index f62d91b5c..f62d91b5c 100644
--- a/data/maps/text/Route121.s
+++ b/data/text/maps/Route121.s
diff --git a/data/maps/text/Route121_SafariZoneEntrance.s b/data/text/maps/Route121_SafariZoneEntrance.s
index c3d6dd69b..c3d6dd69b 100644
--- a/data/maps/text/Route121_SafariZoneEntrance.s
+++ b/data/text/maps/Route121_SafariZoneEntrance.s
diff --git a/data/maps/text/Route123.s b/data/text/maps/Route123.s
index bebe88f83..bebe88f83 100644
--- a/data/maps/text/Route123.s
+++ b/data/text/maps/Route123.s
diff --git a/data/maps/text/Route123_BerryMastersHouse.s b/data/text/maps/Route123_BerryMastersHouse.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/Route123_BerryMastersHouse.s
+++ b/data/text/maps/Route123_BerryMastersHouse.s
diff --git a/data/maps/text/Route124.s b/data/text/maps/Route124.s
index 26b76cc2a..26b76cc2a 100644
--- a/data/maps/text/Route124.s
+++ b/data/text/maps/Route124.s
diff --git a/data/maps/text/Route124_DivingTreasureHuntersHouse.s b/data/text/maps/Route124_DivingTreasureHuntersHouse.s
index 84ce7168b..84ce7168b 100644
--- a/data/maps/text/Route124_DivingTreasureHuntersHouse.s
+++ b/data/text/maps/Route124_DivingTreasureHuntersHouse.s
diff --git a/data/maps/text/Route125.s b/data/text/maps/Route125.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route125.s
+++ b/data/text/maps/Route125.s
diff --git a/data/maps/text/Route126.s b/data/text/maps/Route126.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route126.s
+++ b/data/text/maps/Route126.s
diff --git a/data/maps/text/Route127.s b/data/text/maps/Route127.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route127.s
+++ b/data/text/maps/Route127.s
diff --git a/data/maps/text/Route128.s b/data/text/maps/Route128.s
index e2410358b..e2410358b 100644
--- a/data/maps/text/Route128.s
+++ b/data/text/maps/Route128.s
diff --git a/data/maps/text/Route129.s b/data/text/maps/Route129.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route129.s
+++ b/data/text/maps/Route129.s
diff --git a/data/maps/text/Route130.s b/data/text/maps/Route130.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route130.s
+++ b/data/text/maps/Route130.s
diff --git a/data/maps/text/Route131.s b/data/text/maps/Route131.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route131.s
+++ b/data/text/maps/Route131.s
diff --git a/data/maps/text/Route132.s b/data/text/maps/Route132.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route132.s
+++ b/data/text/maps/Route132.s
diff --git a/data/maps/text/Route133.s b/data/text/maps/Route133.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route133.s
+++ b/data/text/maps/Route133.s
diff --git a/data/maps/text/Route134.s b/data/text/maps/Route134.s
index e69de29bb..e69de29bb 100644
--- a/data/maps/text/Route134.s
+++ b/data/text/maps/Route134.s
diff --git a/data/maps/text/RustboroCity.s b/data/text/maps/RustboroCity.s
index 54b658c01..54b658c01 100644
--- a/data/maps/text/RustboroCity.s
+++ b/data/text/maps/RustboroCity.s
diff --git a/data/maps/text/RustboroCity_CuttersHouse.s b/data/text/maps/RustboroCity_CuttersHouse.s
index dc0c394c1..dc0c394c1 100644
--- a/data/maps/text/RustboroCity_CuttersHouse.s
+++ b/data/text/maps/RustboroCity_CuttersHouse.s
diff --git a/data/maps/text/RustboroCity_DevonCorp_1F.s b/data/text/maps/RustboroCity_DevonCorp_1F.s
index 09f130ea8..09f130ea8 100644
--- a/data/maps/text/RustboroCity_DevonCorp_1F.s
+++ b/data/text/maps/RustboroCity_DevonCorp_1F.s
diff --git a/data/maps/text/RustboroCity_DevonCorp_2F.s b/data/text/maps/RustboroCity_DevonCorp_2F.s
index de37c8266..de37c8266 100644
--- a/data/maps/text/RustboroCity_DevonCorp_2F.s
+++ b/data/text/maps/RustboroCity_DevonCorp_2F.s
diff --git a/data/maps/text/RustboroCity_DevonCorp_3F.s b/data/text/maps/RustboroCity_DevonCorp_3F.s
index 011513d8d..011513d8d 100644
--- a/data/maps/text/RustboroCity_DevonCorp_3F.s
+++ b/data/text/maps/RustboroCity_DevonCorp_3F.s
diff --git a/data/maps/text/RustboroCity_Flat1_1F.s b/data/text/maps/RustboroCity_Flat1_1F.s
index afd8384b7..afd8384b7 100644
--- a/data/maps/text/RustboroCity_Flat1_1F.s
+++ b/data/text/maps/RustboroCity_Flat1_1F.s
diff --git a/data/maps/text/RustboroCity_Flat1_2F.s b/data/text/maps/RustboroCity_Flat1_2F.s
index 79553bf9c..79553bf9c 100644
--- a/data/maps/text/RustboroCity_Flat1_2F.s
+++ b/data/text/maps/RustboroCity_Flat1_2F.s
diff --git a/data/maps/text/RustboroCity_Flat2_1F.s b/data/text/maps/RustboroCity_Flat2_1F.s
index 9ae0b72d7..9ae0b72d7 100644
--- a/data/maps/text/RustboroCity_Flat2_1F.s
+++ b/data/text/maps/RustboroCity_Flat2_1F.s
diff --git a/data/maps/text/RustboroCity_Flat2_2F.s b/data/text/maps/RustboroCity_Flat2_2F.s
index 797b6f810..797b6f810 100644
--- a/data/maps/text/RustboroCity_Flat2_2F.s
+++ b/data/text/maps/RustboroCity_Flat2_2F.s
diff --git a/data/maps/text/RustboroCity_Flat2_3F.s b/data/text/maps/RustboroCity_Flat2_3F.s
index bb05f1932..bb05f1932 100644
--- a/data/maps/text/RustboroCity_Flat2_3F.s
+++ b/data/text/maps/RustboroCity_Flat2_3F.s
diff --git a/data/maps/text/RustboroCity_Gym.s b/data/text/maps/RustboroCity_Gym.s
index e87ecbd6e..e87ecbd6e 100644
--- a/data/maps/text/RustboroCity_Gym.s
+++ b/data/text/maps/RustboroCity_Gym.s
diff --git a/data/maps/text/RustboroCity_House1.s b/data/text/maps/RustboroCity_House1.s
index 2835b8abe..2835b8abe 100644
--- a/data/maps/text/RustboroCity_House1.s
+++ b/data/text/maps/RustboroCity_House1.s
diff --git a/data/maps/text/RustboroCity_House2.s b/data/text/maps/RustboroCity_House2.s
index fba2dc73c..fba2dc73c 100644
--- a/data/maps/text/RustboroCity_House2.s
+++ b/data/text/maps/RustboroCity_House2.s
diff --git a/data/maps/text/RustboroCity_House3.s b/data/text/maps/RustboroCity_House3.s
index 69c64c3d4..69c64c3d4 100644
--- a/data/maps/text/RustboroCity_House3.s
+++ b/data/text/maps/RustboroCity_House3.s
diff --git a/data/maps/text/RustboroCity_Mart.s b/data/text/maps/RustboroCity_Mart.s
index 48b5ea874..48b5ea874 100644
--- a/data/maps/text/RustboroCity_Mart.s
+++ b/data/text/maps/RustboroCity_Mart.s
diff --git a/data/maps/text/RustboroCity_PokemonCenter_1F.s b/data/text/maps/RustboroCity_PokemonCenter_1F.s
index be48ec5c8..be48ec5c8 100644
--- a/data/maps/text/RustboroCity_PokemonCenter_1F.s
+++ b/data/text/maps/RustboroCity_PokemonCenter_1F.s
diff --git a/data/maps/text/RustboroCity_PokemonSchool.s b/data/text/maps/RustboroCity_PokemonSchool.s
index a6cd855c4..a6cd855c4 100644
--- a/data/maps/text/RustboroCity_PokemonSchool.s
+++ b/data/text/maps/RustboroCity_PokemonSchool.s
diff --git a/data/maps/text/RusturfTunnel.s b/data/text/maps/RusturfTunnel.s
index 4905383e0..4905383e0 100644
--- a/data/maps/text/RusturfTunnel.s
+++ b/data/text/maps/RusturfTunnel.s
diff --git a/data/maps/text/SSTidalCorridor.s b/data/text/maps/SSTidalCorridor.s
index 530ff6c55..530ff6c55 100644
--- a/data/maps/text/SSTidalCorridor.s
+++ b/data/text/maps/SSTidalCorridor.s
diff --git a/data/maps/text/SSTidalLowerDeck.s b/data/text/maps/SSTidalLowerDeck.s
index 8792f18d5..8792f18d5 100644
--- a/data/maps/text/SSTidalLowerDeck.s
+++ b/data/text/maps/SSTidalLowerDeck.s
diff --git a/data/maps/text/SSTidalRooms.s b/data/text/maps/SSTidalRooms.s
index a0f9000d3..a0f9000d3 100644
--- a/data/maps/text/SSTidalRooms.s
+++ b/data/text/maps/SSTidalRooms.s
diff --git a/data/maps/text/SafariZone_Northeast.s b/data/text/maps/SafariZone_Northeast.s
index 5134aa15f..5134aa15f 100644
--- a/data/maps/text/SafariZone_Northeast.s
+++ b/data/text/maps/SafariZone_Northeast.s
diff --git a/data/maps/text/SafariZone_Northwest.s b/data/text/maps/SafariZone_Northwest.s
index cb7046baf..cb7046baf 100644
--- a/data/maps/text/SafariZone_Northwest.s
+++ b/data/text/maps/SafariZone_Northwest.s
diff --git a/data/maps/text/SafariZone_RestHouse.s b/data/text/maps/SafariZone_RestHouse.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/SafariZone_RestHouse.s
+++ b/data/text/maps/SafariZone_RestHouse.s
diff --git a/data/maps/text/SafariZone_Southeast.s b/data/text/maps/SafariZone_Southeast.s
index 3f8e7df99..3f8e7df99 100644
--- a/data/maps/text/SafariZone_Southeast.s
+++ b/data/text/maps/SafariZone_Southeast.s
diff --git a/data/maps/text/SafariZone_Southwest.s b/data/text/maps/SafariZone_Southwest.s
index de7d9913b..de7d9913b 100644
--- a/data/maps/text/SafariZone_Southwest.s
+++ b/data/text/maps/SafariZone_Southwest.s
diff --git a/data/maps/text/SeafloorCavern_Room1.s b/data/text/maps/SeafloorCavern_Room1.s
index 7200026f6..7200026f6 100644
--- a/data/maps/text/SeafloorCavern_Room1.s
+++ b/data/text/maps/SeafloorCavern_Room1.s
diff --git a/data/maps/text/SeafloorCavern_Room3.s b/data/text/maps/SeafloorCavern_Room3.s
index f23b5ab28..f23b5ab28 100644
--- a/data/maps/text/SeafloorCavern_Room3.s
+++ b/data/text/maps/SeafloorCavern_Room3.s
diff --git a/data/maps/text/SeafloorCavern_Room4.s b/data/text/maps/SeafloorCavern_Room4.s
index 2dd1ac5bd..2dd1ac5bd 100644
--- a/data/maps/text/SeafloorCavern_Room4.s
+++ b/data/text/maps/SeafloorCavern_Room4.s
diff --git a/data/maps/text/SeafloorCavern_Room9.s b/data/text/maps/SeafloorCavern_Room9.s
index 77f2ac9f8..77f2ac9f8 100644
--- a/data/maps/text/SeafloorCavern_Room9.s
+++ b/data/text/maps/SeafloorCavern_Room9.s
diff --git a/data/maps/text/SealedChamber_InnerRoom.s b/data/text/maps/SealedChamber_InnerRoom.s
index c62da87ce..c62da87ce 100644
--- a/data/maps/text/SealedChamber_InnerRoom.s
+++ b/data/text/maps/SealedChamber_InnerRoom.s
diff --git a/data/maps/text/SealedChamber_OuterRoom.s b/data/text/maps/SealedChamber_OuterRoom.s
index fdfea3c66..fdfea3c66 100644
--- a/data/maps/text/SealedChamber_OuterRoom.s
+++ b/data/text/maps/SealedChamber_OuterRoom.s
diff --git a/data/maps/text/SecretBase_RedCave1.s b/data/text/maps/SecretBase_RedCave1.s
index 1258599b8..1258599b8 100644
--- a/data/maps/text/SecretBase_RedCave1.s
+++ b/data/text/maps/SecretBase_RedCave1.s
diff --git a/data/maps/text/ShoalCave_LowTideEntranceRoom.s b/data/text/maps/ShoalCave_LowTideEntranceRoom.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/ShoalCave_LowTideEntranceRoom.s
+++ b/data/text/maps/ShoalCave_LowTideEntranceRoom.s
diff --git a/data/maps/text/ShoalCave_LowTideInnerRoom.s b/data/text/maps/ShoalCave_LowTideInnerRoom.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/ShoalCave_LowTideInnerRoom.s
+++ b/data/text/maps/ShoalCave_LowTideInnerRoom.s
diff --git a/data/maps/text/ShoalCave_LowTideLowerRoom.s b/data/text/maps/ShoalCave_LowTideLowerRoom.s
index b59cb0378..b59cb0378 100644
--- a/data/maps/text/ShoalCave_LowTideLowerRoom.s
+++ b/data/text/maps/ShoalCave_LowTideLowerRoom.s
diff --git a/data/maps/text/ShoalCave_LowTideStairsRoom.s b/data/text/maps/ShoalCave_LowTideStairsRoom.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/ShoalCave_LowTideStairsRoom.s
+++ b/data/text/maps/ShoalCave_LowTideStairsRoom.s
diff --git a/data/maps/text/SingleBattleColosseum.s b/data/text/maps/SingleBattleColosseum.s
index 1743b5841..1743b5841 100644
--- a/data/maps/text/SingleBattleColosseum.s
+++ b/data/text/maps/SingleBattleColosseum.s
diff --git a/data/maps/text/SlateportCity.s b/data/text/maps/SlateportCity.s
index bcad42f2d..bcad42f2d 100644
--- a/data/maps/text/SlateportCity.s
+++ b/data/text/maps/SlateportCity.s
diff --git a/data/maps/text/SlateportCity_ContestHall.s b/data/text/maps/SlateportCity_ContestHall.s
index edc29d872..edc29d872 100644
--- a/data/maps/text/SlateportCity_ContestHall.s
+++ b/data/text/maps/SlateportCity_ContestHall.s
diff --git a/data/maps/text/SlateportCity_ContestLobby.s b/data/text/maps/SlateportCity_ContestLobby.s
index a4f42c1b0..a4f42c1b0 100644
--- a/data/maps/text/SlateportCity_ContestLobby.s
+++ b/data/text/maps/SlateportCity_ContestLobby.s
diff --git a/data/maps/text/SlateportCity_Harbor.s b/data/text/maps/SlateportCity_Harbor.s
index 06c82f94b..06c82f94b 100644
--- a/data/maps/text/SlateportCity_Harbor.s
+++ b/data/text/maps/SlateportCity_Harbor.s
diff --git a/data/maps/text/SlateportCity_House1.s b/data/text/maps/SlateportCity_House1.s
index dad8b0c5b..dad8b0c5b 100644
--- a/data/maps/text/SlateportCity_House1.s
+++ b/data/text/maps/SlateportCity_House1.s
diff --git a/data/maps/text/SlateportCity_House2.s b/data/text/maps/SlateportCity_House2.s
index 8ae21ce9a..8ae21ce9a 100644
--- a/data/maps/text/SlateportCity_House2.s
+++ b/data/text/maps/SlateportCity_House2.s
diff --git a/data/maps/text/SlateportCity_Mart.s b/data/text/maps/SlateportCity_Mart.s
index 336b32d9b..336b32d9b 100644
--- a/data/maps/text/SlateportCity_Mart.s
+++ b/data/text/maps/SlateportCity_Mart.s
diff --git a/data/maps/text/SlateportCity_OceanicMuseum_1F.s b/data/text/maps/SlateportCity_OceanicMuseum_1F.s
index 7ef418d39..7ef418d39 100644
--- a/data/maps/text/SlateportCity_OceanicMuseum_1F.s
+++ b/data/text/maps/SlateportCity_OceanicMuseum_1F.s
diff --git a/data/maps/text/SlateportCity_OceanicMuseum_2F.s b/data/text/maps/SlateportCity_OceanicMuseum_2F.s
index e1f087543..e1f087543 100644
--- a/data/maps/text/SlateportCity_OceanicMuseum_2F.s
+++ b/data/text/maps/SlateportCity_OceanicMuseum_2F.s
diff --git a/data/maps/text/SlateportCity_PokemonCenter_1F.s b/data/text/maps/SlateportCity_PokemonCenter_1F.s
index 549cca714..549cca714 100644
--- a/data/maps/text/SlateportCity_PokemonCenter_1F.s
+++ b/data/text/maps/SlateportCity_PokemonCenter_1F.s
diff --git a/data/maps/text/SlateportCity_PokemonFanClub.s b/data/text/maps/SlateportCity_PokemonFanClub.s
index 5bb7c1aeb..5bb7c1aeb 100644
--- a/data/maps/text/SlateportCity_PokemonFanClub.s
+++ b/data/text/maps/SlateportCity_PokemonFanClub.s
diff --git a/data/maps/text/SlateportCity_SternsShipyard_1F.s b/data/text/maps/SlateportCity_SternsShipyard_1F.s
index 35dbb3bee..35dbb3bee 100644
--- a/data/maps/text/SlateportCity_SternsShipyard_1F.s
+++ b/data/text/maps/SlateportCity_SternsShipyard_1F.s
diff --git a/data/maps/text/SlateportCity_SternsShipyard_2F.s b/data/text/maps/SlateportCity_SternsShipyard_2F.s
index 8262216fc..8262216fc 100644
--- a/data/maps/text/SlateportCity_SternsShipyard_2F.s
+++ b/data/text/maps/SlateportCity_SternsShipyard_2F.s
diff --git a/data/maps/text/SootopolisCity.s b/data/text/maps/SootopolisCity.s
index 3c2575b99..3c2575b99 100644
--- a/data/maps/text/SootopolisCity.s
+++ b/data/text/maps/SootopolisCity.s
diff --git a/data/maps/text/SootopolisCity_Gym_1F.s b/data/text/maps/SootopolisCity_Gym_1F.s
index 1047a5326..1047a5326 100644
--- a/data/maps/text/SootopolisCity_Gym_1F.s
+++ b/data/text/maps/SootopolisCity_Gym_1F.s
diff --git a/data/maps/text/SootopolisCity_Gym_B1F.s b/data/text/maps/SootopolisCity_Gym_B1F.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/SootopolisCity_Gym_B1F.s
+++ b/data/text/maps/SootopolisCity_Gym_B1F.s
diff --git a/data/maps/text/SootopolisCity_House1.s b/data/text/maps/SootopolisCity_House1.s
index 57ae71945..57ae71945 100644
--- a/data/maps/text/SootopolisCity_House1.s
+++ b/data/text/maps/SootopolisCity_House1.s
diff --git a/data/maps/text/SootopolisCity_House2.s b/data/text/maps/SootopolisCity_House2.s
index 42ed0a803..42ed0a803 100644
--- a/data/maps/text/SootopolisCity_House2.s
+++ b/data/text/maps/SootopolisCity_House2.s
diff --git a/data/maps/text/SootopolisCity_House3.s b/data/text/maps/SootopolisCity_House3.s
index 4bc270f16..4bc270f16 100644
--- a/data/maps/text/SootopolisCity_House3.s
+++ b/data/text/maps/SootopolisCity_House3.s
diff --git a/data/maps/text/SootopolisCity_House4.s b/data/text/maps/SootopolisCity_House4.s
index 5d49f5cf7..5d49f5cf7 100644
--- a/data/maps/text/SootopolisCity_House4.s
+++ b/data/text/maps/SootopolisCity_House4.s
diff --git a/data/maps/text/SootopolisCity_House5.s b/data/text/maps/SootopolisCity_House5.s
index 9fca78e0f..9fca78e0f 100644
--- a/data/maps/text/SootopolisCity_House5.s
+++ b/data/text/maps/SootopolisCity_House5.s
diff --git a/data/maps/text/SootopolisCity_House6.s b/data/text/maps/SootopolisCity_House6.s
index 895719f84..895719f84 100644
--- a/data/maps/text/SootopolisCity_House6.s
+++ b/data/text/maps/SootopolisCity_House6.s
diff --git a/data/maps/text/SootopolisCity_House7.s b/data/text/maps/SootopolisCity_House7.s
index 027ea91e5..027ea91e5 100644
--- a/data/maps/text/SootopolisCity_House7.s
+++ b/data/text/maps/SootopolisCity_House7.s
diff --git a/data/maps/text/SootopolisCity_House8.s b/data/text/maps/SootopolisCity_House8.s
index cb1046272..cb1046272 100644
--- a/data/maps/text/SootopolisCity_House8.s
+++ b/data/text/maps/SootopolisCity_House8.s
diff --git a/data/maps/text/SootopolisCity_Mart.s b/data/text/maps/SootopolisCity_Mart.s
index e45624067..e45624067 100644
--- a/data/maps/text/SootopolisCity_Mart.s
+++ b/data/text/maps/SootopolisCity_Mart.s
diff --git a/data/maps/text/SootopolisCity_PokemonCenter_1F.s b/data/text/maps/SootopolisCity_PokemonCenter_1F.s
index e8a78c9b6..e8a78c9b6 100644
--- a/data/maps/text/SootopolisCity_PokemonCenter_1F.s
+++ b/data/text/maps/SootopolisCity_PokemonCenter_1F.s
diff --git a/data/maps/text/SouthernIsland_Exterior.s b/data/text/maps/SouthernIsland_Exterior.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/SouthernIsland_Exterior.s
+++ b/data/text/maps/SouthernIsland_Exterior.s
diff --git a/data/maps/text/SouthernIsland_Interior.s b/data/text/maps/SouthernIsland_Interior.s
index 8b1378917..8b1378917 100644
--- a/data/maps/text/SouthernIsland_Interior.s
+++ b/data/text/maps/SouthernIsland_Interior.s
diff --git a/data/maps/text/TradeCenter.s b/data/text/maps/TradeCenter.s
index 62b14b737..62b14b737 100644
--- a/data/maps/text/TradeCenter.s
+++ b/data/text/maps/TradeCenter.s
diff --git a/data/maps/text/Underwater_SeafloorCavern.s b/data/text/maps/Underwater_SeafloorCavern.s
index 80153230f..80153230f 100644
--- a/data/maps/text/Underwater_SeafloorCavern.s
+++ b/data/text/maps/Underwater_SeafloorCavern.s
diff --git a/data/maps/text/VerdanturfTown.s b/data/text/maps/VerdanturfTown.s
index 7cdd8b9bc..7cdd8b9bc 100644
--- a/data/maps/text/VerdanturfTown.s
+++ b/data/text/maps/VerdanturfTown.s
diff --git a/data/maps/text/VerdanturfTown_ContestHall.s b/data/text/maps/VerdanturfTown_ContestHall.s
index fda2a8022..fda2a8022 100644
--- a/data/maps/text/VerdanturfTown_ContestHall.s
+++ b/data/text/maps/VerdanturfTown_ContestHall.s
diff --git a/data/maps/text/VerdanturfTown_ContestLobby.s b/data/text/maps/VerdanturfTown_ContestLobby.s
index 8c2240ba9..8c2240ba9 100644
--- a/data/maps/text/VerdanturfTown_ContestLobby.s
+++ b/data/text/maps/VerdanturfTown_ContestLobby.s
diff --git a/data/maps/text/VerdanturfTown_FriendshipRatersHouse.s b/data/text/maps/VerdanturfTown_FriendshipRatersHouse.s
index 9d8e968b6..9d8e968b6 100644
--- a/data/maps/text/VerdanturfTown_FriendshipRatersHouse.s
+++ b/data/text/maps/VerdanturfTown_FriendshipRatersHouse.s
diff --git a/data/maps/text/VerdanturfTown_House.s b/data/text/maps/VerdanturfTown_House.s
index 8cdb826c3..8cdb826c3 100644
--- a/data/maps/text/VerdanturfTown_House.s
+++ b/data/text/maps/VerdanturfTown_House.s
diff --git a/data/maps/text/VerdanturfTown_Mart.s b/data/text/maps/VerdanturfTown_Mart.s
index 6bdb54ecd..6bdb54ecd 100644
--- a/data/maps/text/VerdanturfTown_Mart.s
+++ b/data/text/maps/VerdanturfTown_Mart.s
diff --git a/data/maps/text/VerdanturfTown_PokemonCenter_1F.s b/data/text/maps/VerdanturfTown_PokemonCenter_1F.s
index 950922b45..950922b45 100644
--- a/data/maps/text/VerdanturfTown_PokemonCenter_1F.s
+++ b/data/text/maps/VerdanturfTown_PokemonCenter_1F.s
diff --git a/data/maps/text/VerdanturfTown_WandasHouse.s b/data/text/maps/VerdanturfTown_WandasHouse.s
index 684a4c2a3..684a4c2a3 100644
--- a/data/maps/text/VerdanturfTown_WandasHouse.s
+++ b/data/text/maps/VerdanturfTown_WandasHouse.s
diff --git a/data/maps/text/VictoryRoad_1F.s b/data/text/maps/VictoryRoad_1F.s
index d4aaa0943..d4aaa0943 100644
--- a/data/maps/text/VictoryRoad_1F.s
+++ b/data/text/maps/VictoryRoad_1F.s
diff --git a/data/maps/text/VictoryRoad_B1F.s b/data/text/maps/VictoryRoad_B1F.s
index 33a34b871..33a34b871 100644
--- a/data/maps/text/VictoryRoad_B1F.s
+++ b/data/text/maps/VictoryRoad_B1F.s
diff --git a/data/maps/text/VictoryRoad_B2F.s b/data/text/maps/VictoryRoad_B2F.s
index fe7477979..fe7477979 100644
--- a/data/maps/text/VictoryRoad_B2F.s
+++ b/data/text/maps/VictoryRoad_B2F.s