shithub: pokecrystal

diff: cannot open a/gfx/tilesets/sprout-pillar//null: file does not exist: 'a/gfx/tilesets/sprout-pillar//null' diff: cannot open b/gfx/tilesets/tower-pillar//null: file does not exist: 'b/gfx/tilesets/tower-pillar//null'

--- a/constants/tileset_constants.asm

+++ b/constants/tileset_constants.asm

@@ -1,28 +1,28 @@

 ; Tilesets indexes (see data/tilesets.asm)

 const_value set 1

-	const TILESET_JOHTO_1              ; 01

-	const TILESET_JOHTO_2              ; 02

+	const TILESET_JOHTO                ; 01

+	const TILESET_JOHTO_MODERN         ; 02

 	const TILESET_KANTO                ; 03

 	const TILESET_BATTLE_TOWER_OUTSIDE ; 04

-	const TILESET_HOUSE_1              ; 05

+	const TILESET_HOUSE                ; 05

 	const TILESET_PLAYERS_HOUSE        ; 06

 	const TILESET_POKECENTER           ; 07

 	const TILESET_GATE                 ; 08

 	const TILESET_PORT                 ; 09

 	const TILESET_LAB                  ; 0a

-	const TILESET_POWER_PLANT          ; 0b

+	const TILESET_FACILITY             ; 0b

 	const TILESET_MART                 ; 0c

-	const TILESET_CELADON_MANSION      ; 0d

+	const TILESET_MANSION              ; 0d

 	const TILESET_GAME_CORNER          ; 0e

-	const TILESET_GYM_1                ; 0f

-	const TILESET_KURTS_HOUSE          ; 10

+	const TILESET_ELITE_FOUR_ROOM      ; 0f

+	const TILESET_TRADITIONAL_HOUSE    ; 10

 	const TILESET_TRAIN_STATION        ; 11

-	const TILESET_OLIVINE_GYM          ; 12

+	const TILESET_CHAMPIONS_ROOM       ; 12

 	const TILESET_LIGHTHOUSE           ; 13

-	const TILESET_PLAYERS_HOUSE_2F     ; 14

+	const TILESET_PLAYERS_ROOM         ; 14

 	const TILESET_POKECOM_CENTER       ; 15

 	const TILESET_BATTLE_TOWER         ; 16

-	const TILESET_SPROUT_TOWER         ; 17

+	const TILESET_TOWER                ; 17

 	const TILESET_CAVE                 ; 18

 	const TILESET_PARK                 ; 19

 	const TILESET_RUINS_OF_ALPH        ; 1a

@@ -29,8 +29,8 @@

 	const TILESET_RADIO_TOWER          ; 1b

 	const TILESET_UNDERGROUND          ; 1c

 	const TILESET_ICE_PATH             ; 1d

-	const TILESET_WHIRL_ISLANDS        ; 1e

-	const TILESET_ILEX_FOREST          ; 1f

+	const TILESET_DARK_CAVE            ; 1e

+	const TILESET_FOREST               ; 1f

 	const TILESET_BETA_WORD_ROOM       ; 20

 	const TILESET_HO_OH_WORD_ROOM      ; 21

 	const TILESET_KABUTO_WORD_ROOM     ; 22

--- a/data/field_move_blocks.asm

+++ b/data/field_move_blocks.asm

@@ -1,13 +1,13 @@

 CutTreeBlockPointers: ; c862

 ; tileset, block list pointer

-	dbw TILESET_JOHTO_1,     .johto1

-	dbw TILESET_JOHTO_2,     .johto2

-	dbw TILESET_KANTO,       .kanto

-	dbw TILESET_PARK,        .park

-	dbw TILESET_ILEX_FOREST, .ilex_forest

+	dbw TILESET_JOHTO,        .johto

+	dbw TILESET_JOHTO_MODERN, .johto_modern

+	dbw TILESET_KANTO,        .kanto

+	dbw TILESET_PARK,         .park

+	dbw TILESET_FOREST,       .forest

 	db -1 ; end

-.johto1:

+.johto:

 ; facing block, replacement block, animation

 	db $03, $02, 1 ; grass

 	db $5b, $3c, 0 ; tree

@@ -16,7 +16,7 @@

 	db $67, $3e, 0 ; tree

 	db -1 ; end

-.johto2:

+.johto_modern:

 ; facing block, replacement block, animation

 	db $03, $02, $01 ; grass

 	db -1 ; end

@@ -37,7 +37,7 @@

 	db $03, $04, 1 ; grass

 	db -1 ; end

-.ilex_forest:

+.forest:

 ; facing block, replacement block, animation

 	db $0f, $17, 0

 	db -1 ; end

@@ -44,7 +44,7 @@

 WhirlpoolBlockPointers: ; c8a4

-	dbw TILESET_JOHTO_1, .johto

+	dbw TILESET_JOHTO, .johto

 	db -1 ; end

 .johto:

--- a/data/maps/definitions.asm

+++ b/data/maps/definitions.asm

@@ -46,43 +46,43 @@

 MapGroup_Olivine:

 	map_def OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def OlivineGym, TILESET_OLIVINE_GYM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def OlivineTimsHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def OlivineHouseBeta, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def OlivinePunishmentSpeechHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def OlivineGoodRodHouse, TILESET_HOUSE_1, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def OlivineTimsHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def OlivineHouseBeta, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def OlivinePunishmentSpeechHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def OlivineGoodRodHouse, TILESET_HOUSE, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route39Barn, TILESET_KURTS_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route39Farmhouse, TILESET_HOUSE_1, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route38, TILESET_JOHTO_1, ROUTE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

-	map_def Route39, TILESET_JOHTO_1, ROUTE, ROUTE_39, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

-	map_def OlivineCity, TILESET_JOHTO_1, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def Route39Barn, TILESET_TRADITIONAL_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route39Farmhouse, TILESET_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route38, TILESET_JOHTO, ROUTE, ROUTE_38, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def Route39, TILESET_JOHTO, ROUTE, ROUTE_39, MUSIC_ROUTE_37, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def OlivineCity, TILESET_JOHTO, TOWN, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

 MapGroup_Mahogany:

-	map_def MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE_1, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def MahoganyGym, TILESET_GYM_1, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def MahoganyGym, TILESET_ELITE_FOUR_ROOM, INDOOR, MAHOGANY_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route42EcruteakGate, TILESET_GATE, GATE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route42, TILESET_JOHTO_1, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE

-	map_def Route44, TILESET_JOHTO_1, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND

-	map_def MahoganyTown, TILESET_JOHTO_1, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def Route42, TILESET_JOHTO, ROUTE, ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE

+	map_def Route44, TILESET_JOHTO, ROUTE, ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND

+	map_def MahoganyTown, TILESET_JOHTO, TOWN, MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

 MapGroup_Dungeons:

-	map_def SproutTower1F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def SproutTower2F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def SproutTower3F, TILESET_SPROUT_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TinTower1F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TinTower2F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TinTower3F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TinTower4F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TinTower5F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TinTower6F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TinTower7F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TinTower8F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TinTower9F, TILESET_SPROUT_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def BurnedTower1F, TILESET_SPROUT_TOWER, DUNGEON, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE

+	map_def SproutTower1F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def SproutTower2F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def SproutTower3F, TILESET_TOWER, DUNGEON, SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def TinTower1F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def TinTower2F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def TinTower3F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def TinTower4F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def TinTower5F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def TinTower6F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def TinTower7F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def TinTower8F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def TinTower9F, TILESET_TOWER, DUNGEON, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def BurnedTower1F, TILESET_TOWER, DUNGEON, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE

 	map_def BurnedTowerB1F, TILESET_CAVE, CAVE, BURNED_TOWER, MUSIC_BURNED_TOWER, TRUE, PALETTE_NITE, FISHGROUP_SHORE

 	map_def NationalPark, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_NATIONAL_PARK, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

 	map_def NationalParkBugContest, TILESET_PARK, ROUTE, NATIONAL_PARK, MUSIC_BUG_CATCHING_CONTEST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

@@ -91,13 +91,13 @@

 	map_def RadioTower3F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def RadioTower4F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def RadioTower5F, TILESET_RADIO_TOWER, INDOOR, RADIO_TOWER, RADIO_TOWER_MUSIC | MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def RuinsOfAlphOutside, TILESET_JOHTO_1, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND

+	map_def RuinsOfAlphOutside, TILESET_JOHTO, ROUTE, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_POND

 	map_def RuinsOfAlphHoOhChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def RuinsOfAlphKabutoChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def RuinsOfAlphOmanyteChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def RuinsOfAlphAerodactylChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def RuinsOfAlphInnerChamber, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_RUINS_OF_ALPH_INTERIOR, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def RuinsOfAlphResearchCenter, TILESET_POWER_PLANT, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def RuinsOfAlphResearchCenter, TILESET_FACILITY, INDOOR, RUINS_OF_ALPH, MUSIC_UNION_CAVE, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def RuinsOfAlphHoOhItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def RuinsOfAlphKabutoItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def RuinsOfAlphOmanyteItemRoom, TILESET_RUINS_OF_ALPH, DUNGEON, RUINS_OF_ALPH, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE

@@ -117,73 +117,73 @@

 	map_def OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def MahoganyMart1F, TILESET_KURTS_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def MahoganyMart1F, TILESET_TRADITIONAL_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TeamRocketBaseB2F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TeamRocketBaseB3F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def IlexForest, TILESET_ILEX_FOREST, CAVE, ILEX_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_NITE, FISHGROUP_POND

+	map_def TeamRocketBaseB2F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def TeamRocketBaseB3F, TILESET_FACILITY, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def IlexForest, TILESET_FOREST, CAVE, ILEX_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_NITE, FISHGROUP_POND

 	map_def GoldenrodUnderground, TILESET_GATE, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def GoldenrodUndergroundSwitchRoomEntrances, TILESET_GYM_1, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def GoldenrodUndergroundSwitchRoomEntrances, TILESET_ELITE_FOUR_ROOM, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def GoldenrodDeptStoreB1F, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def GoldenrodUndergroundWarehouse, TILESET_UNDERGROUND, DUNGEON, GOLDENROD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def MountMortar1FOutside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE

-	map_def MountMortar1FInside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE

-	map_def MountMortar2FInside, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE

-	map_def MountMortarB1F, TILESET_WHIRL_ISLANDS, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE

+	map_def MountMortar1FOutside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE

+	map_def MountMortar1FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE

+	map_def MountMortar2FInside, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE

+	map_def MountMortarB1F, TILESET_DARK_CAVE, CAVE, MT_MORTAR, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE

 	map_def IcePath1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI

 	map_def IcePathB1F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI

 	map_def IcePathB2FMahoganySide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI

 	map_def IcePathB2FBlackthornSide, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI

 	map_def IcePathB3F, TILESET_ICE_PATH, CAVE, ICE_PATH, MUSIC_DARK_CAVE, TRUE, PALETTE_NITE, FISHGROUP_DRATINI

-	map_def WhirlIslandNW, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

-	map_def WhirlIslandNE, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

-	map_def WhirlIslandSW, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

-	map_def WhirlIslandCave, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

-	map_def WhirlIslandSE, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

-	map_def WhirlIslandB1F, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

-	map_def WhirlIslandB2F, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

-	map_def WhirlIslandLugiaChamber, TILESET_WHIRL_ISLANDS, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

-	map_def SilverCaveRoom1, TILESET_WHIRL_ISLANDS, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DARK, FISHGROUP_LAKE

+	map_def WhirlIslandNW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

+	map_def WhirlIslandNE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

+	map_def WhirlIslandSW, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

+	map_def WhirlIslandCave, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

+	map_def WhirlIslandSE, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

+	map_def WhirlIslandB1F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

+	map_def WhirlIslandB2F, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

+	map_def WhirlIslandLugiaChamber, TILESET_DARK_CAVE, CAVE, WHIRL_ISLANDS, MUSIC_UNION_CAVE, TRUE, PALETTE_DARK, FISHGROUP_WHIRL_ISLANDS

+	map_def SilverCaveRoom1, TILESET_DARK_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DARK, FISHGROUP_LAKE

 	map_def SilverCaveRoom2, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE

 	map_def SilverCaveRoom3, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_DAY, FISHGROUP_LAKE

 	map_def SilverCaveItemRooms, TILESET_CAVE, CAVE, SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_NITE, FISHGROUP_LAKE

-	map_def DarkCaveVioletEntrance, TILESET_WHIRL_ISLANDS, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE

-	map_def DarkCaveBlackthornEntrance, TILESET_WHIRL_ISLANDS, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE

+	map_def DarkCaveVioletEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE

+	map_def DarkCaveBlackthornEntrance, TILESET_DARK_CAVE, CAVE, DARK_CAVE, MUSIC_DARK_CAVE, TRUE, PALETTE_DARK, FISHGROUP_LAKE

 	map_def DragonsDen1F, TILESET_CAVE, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI

-	map_def DragonsDenB1F, TILESET_JOHTO_1, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI

+	map_def DragonsDenB1F, TILESET_JOHTO, CAVE, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_DRATINI

 	map_def DragonShrine, TILESET_LAB, INDOOR, DRAGONS_DEN, MUSIC_DRAGONS_DEN, TRUE, PALETTE_NITE, FISHGROUP_SHORE

 	map_def TohjoFalls, TILESET_CAVE, CAVE, TOHJO_FALLS, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_LAKE

 	map_def DiglettsCave, TILESET_CAVE, CAVE, DIGLETTS_CAVE, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE

 	map_def MountMoon, TILESET_CAVE, CAVE, MT_MOON, MUSIC_MT_MOON, TRUE, PALETTE_NITE, FISHGROUP_SHORE

 	map_def UndergroundPath, TILESET_UNDERGROUND, GATE, UNDERGROUND_PATH, MUSIC_MT_MOON, FALSE, PALETTE_NITE, FISHGROUP_SHORE

-	map_def RockTunnel1F, TILESET_WHIRL_ISLANDS, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE

-	map_def RockTunnelB1F, TILESET_WHIRL_ISLANDS, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE

+	map_def RockTunnel1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE

+	map_def RockTunnelB1F, TILESET_DARK_CAVE, CAVE, ROCK_TUNNEL, MUSIC_MT_MOON, TRUE, PALETTE_DARK, FISHGROUP_SHORE

 	map_def SafariZoneFuchsiaGateBeta, TILESET_GATE, INDOOR, FUCHSIA_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def SafariZoneBeta, TILESET_PARK, CAVE, FUCHSIA_CITY, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

 	map_def VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE

 MapGroup_Ecruteak:

-	map_def EcruteakHouse, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def WiseTriosRoom, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def EcruteakHouse, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def EcruteakLugiaSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def DanceTheatre, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def DanceTheatre, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def EcruteakGym, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def EcruteakItemfinderHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def EcruteakCity, TILESET_JOHTO_1, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND

+	map_def EcruteakGym, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def EcruteakItemfinderHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def EcruteakCity, TILESET_JOHTO, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND

 MapGroup_Blackthorn:

-	map_def BlackthornGym1F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def BlackthornGym2F, TILESET_GYM_1, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def BlackthornDragonSpeechHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def BlackthornEmysHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def BlackthornGym1F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def BlackthornGym2F, TILESET_ELITE_FOUR_ROOM, INDOOR, BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def BlackthornDragonSpeechHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def BlackthornEmysHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def BlackthornMart, TILESET_MART, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def BlackthornPokecenter1F, TILESET_POKECENTER, INDOOR, BLACKTHORN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def MoveDeletersHouse, TILESET_HOUSE_1, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route45, TILESET_JOHTO_1, ROUTE, ROUTE_45, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI_2

-	map_def Route46, TILESET_JOHTO_1, ROUTE, ROUTE_46, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

-	map_def BlackthornCity, TILESET_JOHTO_1, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_POND

+	map_def MoveDeletersHouse, TILESET_HOUSE, INDOOR, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route45, TILESET_JOHTO, ROUTE, ROUTE_45, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_DRATINI_2

+	map_def Route46, TILESET_JOHTO, ROUTE, ROUTE_46, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def BlackthornCity, TILESET_JOHTO, TOWN, BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_POND

 MapGroup_Cinnabar:

 	map_def CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

@@ -196,9 +196,9 @@

 	map_def CinnabarIsland, TILESET_KANTO, TOWN, CINNABAR_ISLAND, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN

 MapGroup_Cerulean:

-	map_def CeruleanGymBadgeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CeruleanPoliceStation, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CeruleanTradeSpeechHouse, TILESET_HOUSE_1, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CeruleanGymBadgeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CeruleanPoliceStation, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CeruleanTradeSpeechHouse, TILESET_HOUSE, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CeruleanPokecenter1F, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CeruleanPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CERULEAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CeruleanGym, TILESET_PORT, INDOOR, CERULEAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_NONE

@@ -205,8 +205,8 @@

 	map_def CeruleanMart, TILESET_MART, INDOOR, CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route10Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route10Pokecenter2FBeta, TILESET_POKECENTER, INDOOR, ROUTE_10, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def PowerPlant, TILESET_POWER_PLANT, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def BillsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def PowerPlant, TILESET_FACILITY, INDOOR, POWER_PLANT, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def BillsHouse, TILESET_HOUSE, INDOOR, ROUTE_25, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route4, TILESET_KANTO, ROUTE, ROUTE_4, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE

 	map_def Route9, TILESET_KANTO, ROUTE, ROUTE_9, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE

 	map_def Route10North, TILESET_KANTO, ROUTE, ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE

@@ -216,33 +216,33 @@

 MapGroup_Azalea:

 	map_def AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CharcoalKiln, TILESET_HOUSE_1, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CharcoalKiln, TILESET_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def KurtsHouse, TILESET_KURTS_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def AzaleaGym, TILESET_GYM_1, INDOOR, AZALEA_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route33, TILESET_JOHTO_2, ROUTE, ROUTE_33, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

-	map_def AzaleaTown, TILESET_JOHTO_2, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def KurtsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def AzaleaGym, TILESET_ELITE_FOUR_ROOM, INDOOR, AZALEA_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route33, TILESET_JOHTO_MODERN, ROUTE, ROUTE_33, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def AzaleaTown, TILESET_JOHTO_MODERN, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

 MapGroup_LakeOfRage:

-	map_def LakeOfRageHiddenPowerHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def LakeOfRageMagikarpHouse, TILESET_HOUSE_1, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def LakeOfRageHiddenPowerHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def LakeOfRageMagikarpHouse, TILESET_HOUSE, INDOOR, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route43MahoganyGate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route43Gate, TILESET_GATE, GATE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route43, TILESET_JOHTO_1, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND

-	map_def LakeOfRage, TILESET_JOHTO_1, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS

+	map_def Route43, TILESET_JOHTO, ROUTE, ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND

+	map_def LakeOfRage, TILESET_JOHTO, TOWN, LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_GYARADOS

 MapGroup_Violet:

-	map_def Route32, TILESET_JOHTO_1, ROUTE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH

-	map_def Route35, TILESET_JOHTO_1, ROUTE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_POND

-	map_def Route36, TILESET_JOHTO_1, ROUTE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

-	map_def Route37, TILESET_JOHTO_1, ROUTE, ROUTE_37, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

-	map_def VioletCity, TILESET_JOHTO_1, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND

+	map_def Route32, TILESET_JOHTO, ROUTE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH

+	map_def Route35, TILESET_JOHTO, ROUTE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_POND

+	map_def Route36, TILESET_JOHTO, ROUTE, ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def Route37, TILESET_JOHTO, ROUTE, ROUTE_37, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def VioletCity, TILESET_JOHTO, TOWN, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND

 	map_def VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def VioletGym, TILESET_GYM_1, INDOOR, VIOLET_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def VioletGym, TILESET_ELITE_FOUR_ROOM, INDOOR, VIOLET_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def VioletNicknameSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def VioletNicknameSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def VioletKylesHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def VioletKylesHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE

@@ -251,16 +251,16 @@

 	map_def Route36NationalParkGate, TILESET_GATE, INDOOR, ROUTE_36, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 MapGroup_Goldenrod:

-	map_def Route34, TILESET_JOHTO_2, ROUTE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

-	map_def GoldenrodCity, TILESET_JOHTO_2, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

-	map_def GoldenrodGym, TILESET_GYM_1, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def GoldenrodBikeShop, TILESET_OLIVINE_GYM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def GoldenrodHappinessRater, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def GoldenrodBillsHouse, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route34, TILESET_JOHTO_MODERN, ROUTE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def GoldenrodCity, TILESET_JOHTO_MODERN, TOWN, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def GoldenrodGym, TILESET_ELITE_FOUR_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def GoldenrodBikeShop, TILESET_CHAMPIONS_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def GoldenrodHappinessRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def GoldenrodBillsHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def GoldenrodFlowerShop, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def GoldenrodPPSpeechHouse, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def GoldenrodNameRater, TILESET_HOUSE_1, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def GoldenrodFlowerShop, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def GoldenrodPPSpeechHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def GoldenrodNameRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def GoldenrodDeptStore1F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def GoldenrodDeptStore2F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def GoldenrodDeptStore3F, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

@@ -274,19 +274,19 @@

 	map_def GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def DayCare, TILESET_HOUSE_1, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 MapGroup_Vermilion:

 	map_def Route6, TILESET_KANTO, ROUTE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND

 	map_def Route11, TILESET_KANTO, ROUTE, ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

 	map_def VermilionCity, TILESET_KANTO, TOWN, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN

-	map_def VermilionHouseFishingSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def VermilionHouseFishingSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def VermilionPokecenter1F, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def VermilionPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def PokemonFanClub, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def VermilionMagnetTrainSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def PokemonFanClub, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def VermilionMagnetTrainSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def VermilionMart, TILESET_MART, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def VermilionHouseDiglettsCaveSpeechHouse, TILESET_HOUSE_1, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def VermilionHouseDiglettsCaveSpeechHouse, TILESET_HOUSE, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def VermilionGym, TILESET_GAME_CORNER, INDOOR, VERMILION_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route6SaffronGate, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route6UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE

@@ -296,18 +296,18 @@

 	map_def PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN

 	map_def RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def BluesHouse, TILESET_HOUSE_1, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def BluesHouse, TILESET_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 MapGroup_Pewter:

 	map_def Route3, TILESET_KANTO, ROUTE, ROUTE_3, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

 	map_def PewterCity, TILESET_KANTO, TOWN, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

-	map_def PewterNidoranSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def PewterGym, TILESET_SPROUT_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def PewterNidoranSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def PewterGym, TILESET_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def PewterPokecenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def PewterSnoozeSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def PewterSnoozeSpeechHouse, TILESET_HOUSE, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 MapGroup_FastShip:

 	map_def OlivinePort, TILESET_PORT, ROUTE, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN

@@ -320,17 +320,17 @@

 	map_def OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

-	map_def MountMoonGiftShop, TILESET_KURTS_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TinTowerRoof, TILESET_SPROUT_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def MountMoonGiftShop, TILESET_TRADITIONAL_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def TinTowerRoof, TILESET_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

 MapGroup_Indigo:

 	map_def Route23, TILESET_KANTO, TOWN, ROUTE_23, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

 	map_def IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def WillsRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def KogasRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def BrunosRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def KarensRoom, TILESET_GYM_1, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def LancesRoom, TILESET_OLIVINE_GYM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def WillsRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def KogasRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def BrunosRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def KarensRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def LancesRoom, TILESET_CHAMPIONS_ROOM, INDOOR, INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def HallOfFame, TILESET_ICE_PATH, INDOOR, INDIGO_PLATEAU, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 MapGroup_Fuchsia:

@@ -342,10 +342,10 @@

 	map_def FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def FuchsiaBillSpeechHouse, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def FuchsiaBillSpeechHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def SafariZoneWardensHome, TILESET_HOUSE_1, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def SafariZoneWardensHome, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route15FuchsiaGate, TILESET_GATE, GATE, ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 MapGroup_Lavender:

@@ -355,20 +355,20 @@

 	map_def LavenderTown, TILESET_KANTO, TOWN, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

 	map_def LavenderPokecenter1F, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def LavenderPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LAVENDER_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def MrFujisHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def LavenderSpeechHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def LavenderNameRater, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def MrFujisHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def LavenderSpeechHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def LavenderNameRater, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def LavenderMart, TILESET_MART, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def SoulHouse, TILESET_HOUSE_1, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def SoulHouse, TILESET_HOUSE, INDOOR, LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def LavRadioTower1F, TILESET_RADIO_TOWER, INDOOR, LAV_RADIO_TOWER, MUSIC_LAVENDER_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route8SaffronGate, TILESET_GATE, GATE, ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route12SuperRodHouse, TILESET_HOUSE_1, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route12SuperRodHouse, TILESET_HOUSE, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 MapGroup_Silver:

 	map_def Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND

 	map_def SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND

 	map_def SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route28FamousSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route28FamousSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 MapGroup_CableClub:

 	map_def Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE

@@ -375,8 +375,8 @@

 	map_def TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def MobileTradeRoomMobile, TILESET_CELADON_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def MobileBattleRoom, TILESET_CELADON_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def MobileTradeRoomMobile, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def MobileBattleRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 MapGroup_Celadon:

 	map_def Route7, TILESET_KANTO, ROUTE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

@@ -390,11 +390,11 @@

 	map_def CeladonDeptStore5F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CeladonDeptStore6F, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CeladonDeptStoreElevator, TILESET_MART, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CeladonMansion1F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CeladonMansion2F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CeladonMansion3F, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CeladonMansionRoof, TILESET_CELADON_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CeladonMansionRoofHouse, TILESET_HOUSE_1, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CeladonMansion1F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CeladonMansion2F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CeladonMansion3F, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CeladonMansionRoof, TILESET_MANSION, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CeladonMansionRoofHouse, TILESET_HOUSE, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CeladonPokecenter1F, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CeladonPokecenter2FBeta, TILESET_POKECENTER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CeladonGameCorner, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

@@ -401,22 +401,22 @@

 	map_def CeladonGameCornerPrizeRoom, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CeladonGym, TILESET_TRAIN_STATION, INDOOR, CELADON_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CeladonCafe, TILESET_GAME_CORNER, INDOOR, CELADON_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route16FuchsiaSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route16FuchsiaSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_16, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route16Gate, TILESET_GATE, GATE, ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route7SaffronGate, TILESET_GATE, GATE, ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route17Route18Gate, TILESET_GATE, GATE, ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 MapGroup_Cianwood:

-	map_def Route40, TILESET_JOHTO_1, ROUTE, ROUTE_40, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

-	map_def Route41, TILESET_JOHTO_1, ROUTE, ROUTE_41, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN

-	map_def CianwoodCity, TILESET_JOHTO_1, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

-	map_def ManiasHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CianwoodGym, TILESET_SPROUT_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route40, TILESET_JOHTO, ROUTE, ROUTE_40, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def Route41, TILESET_JOHTO, ROUTE, ROUTE_41, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN

+	map_def CianwoodCity, TILESET_JOHTO, TOWN, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def ManiasHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CianwoodGym, TILESET_TOWER, INDOOR, CIANWOOD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CianwoodPokecenter1F, TILESET_POKECENTER, INDOOR, CIANWOOD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CianwoodPharmacy, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CianwoodPhotoStudio, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CianwoodLugiaSpeechHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def PokeSeersHouse, TILESET_HOUSE_1, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CianwoodPharmacy, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE

@@ -429,29 +429,29 @@

 	map_def Route22, TILESET_KANTO, ROUTE, ROUTE_22, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND

 	map_def ViridianCity, TILESET_KANTO, TOWN, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND

 	map_def ViridianGym, TILESET_TRAIN_STATION, INDOOR, VIRIDIAN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def ViridianNicknameSpeechHouse, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TrainerHouse1F, TILESET_HOUSE_1, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def TrainerHouseB1F, TILESET_POWER_PLANT, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def ViridianNicknameSpeechHouse, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def TrainerHouse1F, TILESET_HOUSE, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def TrainerHouseB1F, TILESET_FACILITY, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route2NuggetSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route2NuggetSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 MapGroup_NewBark:

-	map_def Route26, TILESET_JOHTO_1, ROUTE, ROUTE_26, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN

-	map_def Route27, TILESET_JOHTO_1, ROUTE, ROUTE_27, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN

-	map_def Route29, TILESET_JOHTO_1, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

-	map_def NewBarkTown, TILESET_JOHTO_1, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN

+	map_def Route26, TILESET_JOHTO, ROUTE, ROUTE_26, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN

+	map_def Route27, TILESET_JOHTO, ROUTE, ROUTE_27, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN

+	map_def Route29, TILESET_JOHTO, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def NewBarkTown, TILESET_JOHTO, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN

 	map_def ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def KrissHouse2F, TILESET_PLAYERS_HOUSE_2F, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def KrissNeighborsHouse, TILESET_HOUSE_1, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def KrissHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def KrissNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route26HealSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route26DayofWeekSiblingsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route27SandstormHouse, TILESET_HOUSE_1, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route26HealSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route26DayofWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route27SandstormHouse, TILESET_HOUSE, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 MapGroup_Saffron:

@@ -462,24 +462,24 @@

 	map_def SaffronMart, TILESET_MART, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def MrPsychicsHouse, TILESET_HOUSE_1, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def MrPsychicsHouse, TILESET_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def SaffronMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def SilphCo1F, TILESET_POWER_PLANT, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def SilphCo1F, TILESET_FACILITY, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route5CleanseTagSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 MapGroup_Cherrygrove:

-	map_def Route30, TILESET_JOHTO_1, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND

-	map_def Route31, TILESET_JOHTO_1, ROUTE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND

-	map_def CherrygroveCity, TILESET_JOHTO_1, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

+	map_def Route30, TILESET_JOHTO, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND

+	map_def Route31, TILESET_JOHTO, ROUTE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND

+	map_def CherrygroveCity, TILESET_JOHTO, TOWN, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

 	map_def CherrygroveMart, TILESET_MART, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def CherrygrovePokecenter1F, TILESET_POKECENTER, INDOOR, CHERRYGROVE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CherrygroveGymSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def GuideGentsHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def CherrygroveEvolutionSpeechHouse, TILESET_HOUSE_1, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def Route30BerrySpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

-	map_def MrPokemonsHouse, TILESET_POWER_PLANT, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CherrygroveGymSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def GuideGentsHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def CherrygroveEvolutionSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def Route30BerrySpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

+	map_def MrPokemonsHouse, TILESET_FACILITY, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE

 	map_def Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE

--- a/data/tilesets.asm

+++ b/data/tilesets.asm

@@ -13,29 +13,29 @@

 Tilesets:: ; 4d596

 ; entries correspond to TILESET_* constants

 	tileset Tileset0

-	tileset TilesetJohto1

-	tileset TilesetJohto2

+	tileset TilesetJohto

+	tileset TilesetJohtoModern

 	tileset TilesetKanto

 	tileset TilesetBattleTowerOutside

-	tileset TilesetHouse1

+	tileset TilesetHouse

 	tileset TilesetPlayersHouse

 	tileset TilesetPokecenter

 	tileset TilesetGate

 	tileset TilesetPort

 	tileset TilesetLab

-	tileset TilesetPowerPlant

+	tileset TilesetFacility

 	tileset TilesetMart

-	tileset TilesetCeladonMansion

+	tileset TilesetMansion

 	tileset TilesetGameCorner

-	tileset TilesetGym1

-	tileset TilesetKurtsHouse

+	tileset TilesetEliteFourRoom

+	tileset TilesetTraditionalHouse

 	tileset TilesetTrainStation

-	tileset TilesetOlivineGym

+	tileset TilesetChampionsRoom

 	tileset TilesetLighthouse

-	tileset TilesetPlayersHouse2F

+	tileset TilesetPlayersRoom

 	tileset TilesetPokeComCenter

 	tileset TilesetBattleTower

-	tileset TilesetSproutTower

+	tileset TilesetTower

 	tileset TilesetCave

 	tileset TilesetPark

 	tileset TilesetRuinsOfAlph

@@ -42,8 +42,8 @@

 	tileset TilesetRadioTower

 	tileset TilesetUnderground

 	tileset TilesetIcePath

-	tileset TilesetWhirlIslands

-	tileset TilesetIlexForest

+	tileset TilesetDarkCave

+	tileset TilesetForest

 	tileset TilesetBetaWordRoom

 	tileset TilesetHoOhWordRoom

 	tileset TilesetKabutoWordRoom

--- a/data/tilesets/celadon_mansion_collision.asm

+++ /dev/null

@@ -1,64 +1,0 @@

-	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, WALL, WALL ; 02

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 05

-	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 07

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 08

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 09

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0a

-	tilecoll WALL, WALL, FLOOR, WALL ; 0b

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0c

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d

-	tilecoll WALL, WALL, FLOOR, WALL ; 0e

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0f

-	tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 10

-	tilecoll WALL, WALL, WALL, WALL ; 11

-	tilecoll WALL, WALL, BOOKSHELF, WALL ; 12

-	tilecoll WALL, WALL, WALL, WALL ; 13

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 15

-	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 16

-	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 17

-	tilecoll WALL, DOOR, FLOOR, FLOOR ; 18

-	tilecoll WALL, WALL, BOOKSHELF, WALL ; 19

-	tilecoll WALL, WALL, WALL, WALL ; 1a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 1e

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 1f

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 20

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 21

-	tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 22

-	tilecoll WALL, WALL, FLOOR, WALL ; 23

-	tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 24

-	tilecoll WALL, WALL, WALL, STAIRCASE ; 25

-	tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 26

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 27

-	tilecoll WALL, WALL, DOOR, WALL ; 28

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 29

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 2a

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 2b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c

-	tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2d

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f

-	tilecoll WALL, WALL, WALL, FLOOR ; 30

-	tilecoll WALL, WALL, FLOOR, WALL ; 31

-	tilecoll WALL, WALL, FLOOR, WALL ; 32

-	tilecoll WALL, WALL, WALL, WALL ; 33

-	tilecoll WALL, WALL, WALL, FLOOR ; 34

-	tilecoll WALL, WALL, WALL, WALL ; 35

-	tilecoll FLOOR, WALL, WALL, WALL ; 36

-	tilecoll WALL, WALL, FLOOR, WALL ; 37

-	tilecoll WALL, FLOOR, WALL, WALL ; 38

-	tilecoll WALL, WALL, FLOOR, WALL ; 39

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 3b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d

-	tilecoll WALL, FLOOR, WALL, WALL ; 3e

-	tilecoll FLOOR, WALL, WALL, WALL ; 3f

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 40

binary files a/data/tilesets/celadon_mansion_metatiles.bin /dev/null differ

--- /dev/null

+++ b/data/tilesets/champions_room_collision.asm

@@ -1,0 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 01

+	tilecoll WALL, WALL, FLOOR, WALL ; 02

+	tilecoll WALL, WALL, WALL, FLOOR ; 03

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 04

+	tilecoll WALL, WALL, WALL, WALL ; 05

+	tilecoll WALL, WALL, COUNTER, FLOOR ; 06

+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 07

+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 09

+	tilecoll WALL, FLOOR, FLOOR, WALL ; 0a

+	tilecoll WALL, WALL, WALL, WALL ; 0b

+	tilecoll WALL, WALL, LADDER, LADDER ; 0c

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0d

+	tilecoll WALL, WALL, WALL, WALL ; 0e

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f

+	tilecoll WALL, WALL, WALL, WALL ; 10

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11

+	tilecoll WALL, WALL, WALL, FLOOR ; 12

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13

+	tilecoll WALL, WALL, FLOOR, WALL ; 14

+	tilecoll WALL, FLOOR, WALL, WALL ; 15

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 17

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 19

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c

+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 1d

+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1e

+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 1f

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20

+	tilecoll WALL, FLOOR, WALL, WALL ; 21

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22

+	tilecoll FLOOR, WALL, WALL, WALL ; 23

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 25

+	tilecoll WALL, WALL, WALL, WALL ; 26

+	tilecoll WALL, WALL, WALL, WALL ; 27

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 28

+	tilecoll WALL, WALL, WALL, WALL ; 29

+	tilecoll WALL, WALL, WALL, WALL ; 2a

+	tilecoll WALL, WALL, WALL, WALL ; 2b

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2c

+	tilecoll WALL, WALL, WALL, WALL ; 2d

+	tilecoll WALL, WALL, WALL, WALL ; 2e

+	tilecoll WALL, WALL, WALL, WALL ; 2f

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 30

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 31

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 34

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 35

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 36

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 37

+	tilecoll FLOOR, WALL, WALL, WALL ; 38

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 39

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 3a

+	tilecoll WALL, WALL, WALL, WALL ; 3b

+	tilecoll WALL, WALL, WALL, WALL ; 3c

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e

+	tilecoll WALL, FLOOR, WALL, WALL ; 3f

+	tilecoll FLOOR, WALL, WALL, WALL ; 40

--- /dev/null

+++ b/data/tilesets/champions_room_metatiles.bin

@@ -1,0 +1,15 @@

+
 *()  89+,!!          


%'!!	 5 5 5 5 5&&01                    %&&'677:"##$2334������ַ��������
        +,+, *()  89        SSSSSSSSSSSSSSSSFGFGVWVWFGSSVWSS                FGFGVWVWSSFGSSVW�]���]]]%&&'XYXYѣ�ѥ�����������SSSSSSSSFGFGVWVW����������������FGSSVWSSFGSSVWSSSSFGSSVWSSFGSSVW./SS>?SSNOSS^_SSSS./SS>?SSNOSS^_S@HH@PQQPPQQPPQQHHHHQQQQQQQQQQQQHHBSQQRBQQRRQQRR----------------PPQQPPQQPCDDCDDDQQQQQQQQTUTUTUTUQQRRQQRRDDERDDDESSSSSSSS

+SS

+SS

+SSSS

+FG

+VW

+FG

+VWFG

+VW

+FG

+VW

+SS

+SS

+SS

+SSʰ��˱ݱ̲޲�������αݱϲ޲�����FGFGVWVWFGFGVWVW����]]]]%&&'XYXY����ݱ��޲�������°��ı��Ʋ����������������������]���]���]���]����]���]���]���]�;<<=;<<=;<<=;<<=����������������````````````````;<<=;<<=%&&'XYXY����������������������������������]�]]]�%&&'XYXY�]���]]��]]��]����]��]]��]]���]��]���]���]���]����]���]���]���]���������������������;<<=�����������Ӣ��ґ���������ӡ��Ӣ�������

\ No newline at end of file

--- /dev/null

+++ b/data/tilesets/dark_cave_collision.asm

@@ -1,0 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 01

+	tilecoll WALL, WALL, WALL, WALL ; 02

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04

+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 05

+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06

+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 07

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 09

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c

+	tilecoll WALL, FLOOR, WALL, WALL ; 0d

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e

+	tilecoll FLOOR, WALL, WALL, WALL ; 0f

+	tilecoll WATER, WATER, WATER, WATER ; 10

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13

+	tilecoll FLOOR, FLOOR, WALL, CAVE ; 14

+	tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15

+	tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16

+	tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18

+	tilecoll WALL, WALL, WALL, FLOOR ; 19

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1a

+	tilecoll WALL, WALL, FLOOR, WALL ; 1b

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d

+	tilecoll WALL, WALL, WALL, WALL ; 1e

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1f

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20

+	tilecoll WALL, FLOOR, WALL, WALL ; 21

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 22

+	tilecoll FLOOR, WALL, WALL, WALL ; 23

+	tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24

+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25

+	tilecoll WATER, WATER, WATER, WATER ; 26

+	tilecoll WATER, WATER, WATER, WATER ; 27

+	tilecoll WATER, WATER, WATER, WATER ; 28

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c

+	tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d

+	tilecoll WALL, WALL, WALL, WALL ; 2e

+	tilecoll WALL, WALL, WALL, WALL ; 2f

+	tilecoll WALL, WALL, WALL, WALL ; 30

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31

+	tilecoll WALL, WALL, WALL, WALL ; 32

+	tilecoll WATER, WATER, WATER, WATER ; 33

+	tilecoll WATER, WATER, WATER, WATER ; 34

+	tilecoll WALL, WALL, WALL, WALL ; 35

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 36

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 37

+	tilecoll WALL, WALL, WALL, CAVE ; 38

+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39

+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a

+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b

+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c

+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d

+	tilecoll WATER, WATER, WATER, WATER ; 3e

+	tilecoll WATER, WATER, WATER, WATER ; 3f

+	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40

--- /dev/null

+++ b/data/tilesets/dark_cave_metatiles.bin

@@ -1,0 +1,6 @@

+$$$$$$$$*+:;"#23%&&%&&&&&&&&&&&&&'&&&'

+&

+&&&67&&67&&&&$$$$*+:;$$$$"#23







()89







 !01







$$&&&&



@@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%'

&&&&&&&&

+&

+67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&

+&&&

\ No newline at end of file

--- /dev/null

+++ b/data/tilesets/elite_four_room_collision.asm

@@ -1,0 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 01

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04

+	tilecoll WALL, WALL, WALL, FLOOR ; 05

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 06

+	tilecoll WALL, WALL, FLOOR, WALL ; 07

+	tilecoll WALL, WALL, WALL, WALL ; 08

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 09

+	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 0a

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0c

+	tilecoll WALL, FLOOR, WALL, WALL ; 0d

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e

+	tilecoll FLOOR, WALL, WALL, WALL ; 0f

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 11

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14

+	tilecoll WALL, WALL, WALL, WALL ; 15

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 16

+	tilecoll LADDER, LADDER, FLOOR, FLOOR ; 17

+	tilecoll WALL, WALL, WALL, WALL ; 18

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 19

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1a

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b

+	tilecoll WALL, FLOOR, WALL, WALL ; 1c

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1d

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1e

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1f

+	tilecoll WALL, WALL, WALL, WALL ; 20

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 21

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 22

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 23

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 24

+	tilecoll WALL, WALL, WALL, WALL ; 25

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 26

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 27

+	tilecoll WALL, WALL, WALL, WALL ; 28

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 29

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 2a

+	tilecoll WALL, WALL, WALL, WALL ; 2b

+	tilecoll WALL, WALL, WALL, WALL ; 2c

+	tilecoll WALL, WALL, WALL, WALL ; 2d

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e

+	tilecoll ICE, ICE, ICE, FLOOR ; 2f

+	tilecoll ICE, ICE, FLOOR, ICE ; 30

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31

+	tilecoll FLOOR, ICE, ICE, ICE ; 32

+	tilecoll ICE, FLOOR, ICE, ICE ; 33

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 34

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 35

+	tilecoll ICE, WALL, ICE, WALL ; 36

+	tilecoll WALL, ICE, WALL, ICE ; 37

+	tilecoll WALL, WALL, WALL, WALL ; 38

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39

+	tilecoll ICE, ICE, ICE, ICE ; 3a

+	tilecoll WALL, FLOOR, FLOOR, WALL ; 3b

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c

+	tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3d

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3e

+	tilecoll WALL, WALL, WALL, WALL ; 3f

+	tilecoll WALL, WALL, WALL, WALL ; 40

binary files /dev/null b/data/tilesets/elite_four_room_metatiles.bin differ

--- /dev/null

+++ b/data/tilesets/facility_collision.asm

@@ -1,0 +1,64 @@

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 02

+	tilecoll WALL, WALL, WALL, WALL ; 03

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

+	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 05

+	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 06

+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 07

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 09

+	tilecoll WALL, WALL, WALL, FLOOR ; 0a

+	tilecoll WALL, WALL, FLOOR, WALL ; 0b

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0e

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0f

+	tilecoll WALL, WALL, WALL, WALL ; 10

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 12

+	tilecoll WALL, WALL, WALL, WALL ; 13

+	tilecoll WALL, WALL, WALL, WALL ; 14

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 16

+	tilecoll WALL, WALL, WALL, WALL ; 17

+	tilecoll WALL, WALL, WALL, WALL ; 18

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 19

+	tilecoll WALL, WALL, WALL, WALL ; 1a

+	tilecoll WALL, WALL, WALL, FLOOR ; 1b

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1e

+	tilecoll WALL, WALL, FLOOR, COUNTER ; 1f

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 20

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 21

+	tilecoll WALL, WALL, WALL, FLOOR ; 22

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 23

+	tilecoll WALL, FLOOR, WALL, WALL ; 24

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 25

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 26

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 27

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 29

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2c

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2d

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2f

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 30

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31

+	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 32

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 33

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 34

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 35

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 36

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 37

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 38

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 39

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3a

+	tilecoll FLOOR, WALL, WALL, WALL ; 3b

+	tilecoll WALL, WALL, FLOOR, WALL ; 3c

+	tilecoll WALL, WALL, WALL, FLOOR ; 3d

+	tilecoll WALL, WALL, FLOOR, WALL ; 3e

+	tilecoll WALL, FLOOR, WALL, WALL ; 3f

+	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40

--- /dev/null

+++ b/data/tilesets/facility_metatiles.bin

@@ -1,0 +1,8 @@

+6666666666666666""""""""&&&&@B@B

+&&&&88889999&& !&&&&&01&&&&&@B@B()()()()*+()&&&&&&&&	&&,-""<=""./&>?&"",-""<=&./&>?







&&&&''''7777,-&<=&./&>?&&,-&<=&./&>?@AABPQQRPHIRS::T&&&@A&PQ&&AAABQQQREEFEUUVU

+K

+[EFEEUVUUK

+[&PQ&S:&&QQQR:::T&&EFE;UVU;JKJ;Z[Z;6666666666666666AAABMMMN88889999""""""""#$$%WXXY""""@B""PRPRPRPRPR""23""CD&&&&""""""@B&PR&PR;;;;;;;;&&&&&&&&;;;;;;;;""""@B""PR&PR&PR&PR&PR&PR&PR&PR&PR@APRLM&&&&&@A&LM&&&&AB&MN&&&&&@B@APRLM&&&&	&&@AABPHIR	&&&&&&@B&PR&PR&PR&PR&&@BPR#$$%WXXY&&&&PRPRPRPR@B&PR&PR&PR&@AAALMMM&&&&AAABMMMN&&&&&@B&PR&PR&PR&&&&AAAAMMMM""""""""&&AAAAMMMM&&&&&PR&PR&PR&PR&@A&PQ&PQ&S:@AAALMMM88889999&PR&PRABPRMNPR""""""\]&^_&@B@APRLMPR&PR&AB@BMNPR&PR&PRPR&PR&PR@ALM&PR&PRABPRMN

\ No newline at end of file

--- /dev/null

+++ b/data/tilesets/forest_collision.asm

@@ -1,0 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 01

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02

+	tilecoll WATER, WATER, WATER, WATER ; 03

+	tilecoll WATER, WATER, WATER, WATER ; 04

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

+	tilecoll WALL, WALL, WALL, WALL ; 06

+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 07

+	tilecoll WATER, WATER, WATER, WATER ; 08

+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 09

+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 0a

+	tilecoll WATER, WATER, WATER, WATER ; 0b

+	tilecoll WATER, WATER, WATER, WATER ; 0c

+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0d

+	tilecoll WATER, WATER, WATER, WATER ; 0e

+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0f

+	tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 10

+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11

+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 12

+	tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 13

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14

+	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 15

+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 16

+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 17

+	tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 18

+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 19

+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 1a

+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b

+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1c

+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1d

+	tilecoll WALL, WALL, WALL, WALL ; 1e

+	tilecoll WALL, WALL, WALL, WALL ; 1f

+	tilecoll WALL, WALL, WALL, WALL ; 20

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21

+	tilecoll WALL, WALL, WALL, WALL ; 22

+	tilecoll WALL, WALL, WALL, WALL ; 23

+	tilecoll WALL, WALL, WALL, WALL ; 24

+	tilecoll WALL, WALL, WALL, DOOR ; 25

+	tilecoll WALL, WALL, WALL, WALL ; 26

+	tilecoll WALL, WALL, WALL, WALL ; 27

+	tilecoll WALL, WALL, WALL, WALL ; 28

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 29

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2a

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2b

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2c

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2d

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2e

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 2f

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 30

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 31

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 32

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 33

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 34

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 35

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 36

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 37

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 38

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 39

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3a

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3b

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3c

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3d

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3e

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3f

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 40

--- /dev/null

+++ b/data/tilesets/forest_metatiles.bin

@@ -1,0 +1,1 @@

+
,-./<=>?****
,-./<=>?	***&'&'6767&'67&'&'6767&'67&'67***&'67&'67(9&'8:67&'67&'&'6767&'&'6767&'67&'&'6767&'67&'67&'67&'67)**********+** !!! !!! !!!!!!!!!!!!!!!!!!"!!!"!!!"02 !!!0111#$$$#$!!!!1111$$$$$$!!!"1112$$$%$%#$$$#$$$#$34#$$$#$$$#$$$3444$$$$$$$$$$$$4444$$$%$$$%$$$%4445

\ No newline at end of file

--- a/data/tilesets/gym_1_collision.asm

+++ /dev/null

@@ -1,64 +1,0 @@

-	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04

-	tilecoll WALL, WALL, WALL, FLOOR ; 05

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 06

-	tilecoll WALL, WALL, FLOOR, WALL ; 07

-	tilecoll WALL, WALL, WALL, WALL ; 08

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 09

-	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 0a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0c

-	tilecoll WALL, FLOOR, WALL, WALL ; 0d

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e

-	tilecoll FLOOR, WALL, WALL, WALL ; 0f

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 11

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14

-	tilecoll WALL, WALL, WALL, WALL ; 15

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 16

-	tilecoll LADDER, LADDER, FLOOR, FLOOR ; 17

-	tilecoll WALL, WALL, WALL, WALL ; 18

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 19

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 1a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b

-	tilecoll WALL, FLOOR, WALL, WALL ; 1c

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1d

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1e

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1f

-	tilecoll WALL, WALL, WALL, WALL ; 20

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 21

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 22

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 23

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 24

-	tilecoll WALL, WALL, WALL, WALL ; 25

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 26

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 27

-	tilecoll WALL, WALL, WALL, WALL ; 28

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 29

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 2a

-	tilecoll WALL, WALL, WALL, WALL ; 2b

-	tilecoll WALL, WALL, WALL, WALL ; 2c

-	tilecoll WALL, WALL, WALL, WALL ; 2d

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e

-	tilecoll ICE, ICE, ICE, FLOOR ; 2f

-	tilecoll ICE, ICE, FLOOR, ICE ; 30

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31

-	tilecoll FLOOR, ICE, ICE, ICE ; 32

-	tilecoll ICE, FLOOR, ICE, ICE ; 33

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 34

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 35

-	tilecoll ICE, WALL, ICE, WALL ; 36

-	tilecoll WALL, ICE, WALL, ICE ; 37

-	tilecoll WALL, WALL, WALL, WALL ; 38

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39

-	tilecoll ICE, ICE, ICE, ICE ; 3a

-	tilecoll WALL, FLOOR, FLOOR, WALL ; 3b

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c

-	tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3d

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3e

-	tilecoll WALL, WALL, WALL, WALL ; 3f

-	tilecoll WALL, WALL, WALL, WALL ; 40

binary files a/data/tilesets/gym_1_metatiles.bin /dev/null differ

--- a/data/tilesets/house_1_collision.asm

+++ /dev/null

@@ -1,64 +1,0 @@

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 02

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 03

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 04

-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05

-	tilecoll WALL, WINDOW, FLOOR, FLOOR ; 06

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 07

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 08

-	tilecoll WALL, WINDOW, FLOOR, FLOOR ; 09

-	tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 0a

-	tilecoll WALL, WALL, WALL, WALL ; 0b

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e

-	tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0f

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10

-	tilecoll WALL, WALL, PC, WALL ; 11

-	tilecoll WALL, WALL, WALL, FLOOR ; 12

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 13

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 14

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 15

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16

-	tilecoll WINDOW, WALL, FLOOR, FLOOR ; 17

-	tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 18

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a

-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b

-	tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1c

-	tilecoll WALL, WALL, FLOOR, PC ; 1d

-	tilecoll WALL, WALL, FLOOR, RADIO ; 1e

-	tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1f

-	tilecoll WALL, WALL, WALL, WALL ; 20

-	tilecoll WALL, WALL, WALL, WALL ; 21

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 22

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 23

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 24

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 25

-	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 26

-	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 27

-	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 29

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2b

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2c

-	tilecoll WALL, WALL, WALL, WALL ; 2d

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f

-	tilecoll WALL, WALL, FLOOR, WALL ; 30

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 31

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 32

-	tilecoll WALL, WINDOW, WALL, WALL ; 33

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

binary files a/data/tilesets/house_1_metatiles.bin /dev/null differ

--- /dev/null

+++ b/data/tilesets/house_collision.asm

@@ -1,0 +1,64 @@

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 02

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 03

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04

+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05

+	tilecoll WALL, WINDOW, FLOOR, FLOOR ; 06

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 07

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 08

+	tilecoll WALL, WINDOW, FLOOR, FLOOR ; 09

+	tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 0a

+	tilecoll WALL, WALL, WALL, WALL ; 0b

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e

+	tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0f

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10

+	tilecoll WALL, WALL, PC, WALL ; 11

+	tilecoll WALL, WALL, WALL, FLOOR ; 12

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 13

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 14

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 15

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16

+	tilecoll WINDOW, WALL, FLOOR, FLOOR ; 17

+	tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 18

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a

+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b

+	tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1c

+	tilecoll WALL, WALL, FLOOR, PC ; 1d

+	tilecoll WALL, WALL, FLOOR, RADIO ; 1e

+	tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1f

+	tilecoll WALL, WALL, WALL, WALL ; 20

+	tilecoll WALL, WALL, WALL, WALL ; 21

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 22

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 23

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 24

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 25

+	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 26

+	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 27

+	tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 29

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2b

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2c

+	tilecoll WALL, WALL, WALL, WALL ; 2d

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f

+	tilecoll WALL, WALL, FLOOR, WALL ; 30

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 31

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 32

+	tilecoll WALL, WINDOW, WALL, WALL ; 33

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40

binary files /dev/null b/data/tilesets/house_metatiles.bin differ

--- a/data/tilesets/ilex_forest_collision.asm

+++ /dev/null

@@ -1,64 +1,0 @@

-	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02

-	tilecoll WATER, WATER, WATER, WATER ; 03

-	tilecoll WATER, WATER, WATER, WATER ; 04

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

-	tilecoll WALL, WALL, WALL, WALL ; 06

-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 07

-	tilecoll WATER, WATER, WATER, WATER ; 08

-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 09

-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 0a

-	tilecoll WATER, WATER, WATER, WATER ; 0b

-	tilecoll WATER, WATER, WATER, WATER ; 0c

-	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0d

-	tilecoll WATER, WATER, WATER, WATER ; 0e

-	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0f

-	tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 10

-	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11

-	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 12

-	tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 13

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14

-	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 15

-	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 16

-	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 17

-	tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 18

-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 19

-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 1a

-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b

-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1c

-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1d

-	tilecoll WALL, WALL, WALL, WALL ; 1e

-	tilecoll WALL, WALL, WALL, WALL ; 1f

-	tilecoll WALL, WALL, WALL, WALL ; 20

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21

-	tilecoll WALL, WALL, WALL, WALL ; 22

-	tilecoll WALL, WALL, WALL, WALL ; 23

-	tilecoll WALL, WALL, WALL, WALL ; 24

-	tilecoll WALL, WALL, WALL, DOOR ; 25

-	tilecoll WALL, WALL, WALL, WALL ; 26

-	tilecoll WALL, WALL, WALL, WALL ; 27

-	tilecoll WALL, WALL, WALL, WALL ; 28

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 29

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2a

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2b

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2c

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2d

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2e

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2f

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 30

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 31

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 32

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 33

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 34

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 35

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 36

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 37

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 38

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 39

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3a

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3b

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3c

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3d

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3e

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 3f

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 40

--- a/data/tilesets/ilex_forest_metatiles.bin

+++ /dev/null

@@ -1,1 +1,0 @@

-
,-./<=>?****
,-./<=>?	***&'&'6767&'67&'&'6767&'67&'67***&'67&'67(9&'8:67&'67&'&'6767&'&'6767&'67&'&'6767&'67&'67&'67&'67)**********+** !!! !!! !!!!!!!!!!!!!!!!!!"!!!"!!!"02 !!!0111#$$$#$!!!!1111$$$$$$!!!"1112$$$%$%#$$$#$$$#$34#$$$#$$$#$$$3444$$$$$$$$$$$$4444$$$%$$$%$$$%4445

\ No newline at end of file

--- a/data/tilesets/johto_1_collision.asm

+++ /dev/null

@@ -1,128 +1,0 @@

-	tilecoll 01, 01, 01, 01 ; 01

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

-	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

-	tilecoll WALL, WALL, WALL, WALL ; 06

-	tilecoll LADDER, LADDER, LADDER, LADDER ; 07

-	tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 08

-	tilecoll WALL, WALL, WALL, WALL ; 09

-	tilecoll WALL, WALL, WALL, WALL ; 0a

-	tilecoll WALL, WALL, WALL, WALL ; 0b

-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c

-	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e

-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f

-	tilecoll WALL, WALL, WALL, WALL ; 10

-	tilecoll WALL, WALL, WALL, WALL ; 11

-	tilecoll WALL, WALL, WALL, WALL ; 12

-	tilecoll WALL, WALL, WALL, WALL ; 13

-	tilecoll WALL, WALL, WALL, WALL ; 14

-	tilecoll WALL, WALL, WALL, DOOR ; 15

-	tilecoll WALL, WALL, WALL, WALL ; 16

-	tilecoll WALL, WALL, WALL, DOOR ; 17

-	tilecoll WALL, WALL, WALL, WALL ; 18

-	tilecoll WALL, WALL, WALL, WALL ; 19

-	tilecoll WALL, WALL, WALL, WALL ; 1a

-	tilecoll WALL, WALL, WALL, DOOR ; 1b

-	tilecoll WALL, WALL, WALL, WALL ; 1c

-	tilecoll WALL, WALL, WALL, WALL ; 1d

-	tilecoll WALL, WALL, DOOR, WALL ; 1e

-	tilecoll WALL, WALL, WALL, WALL ; 1f

-	tilecoll WALL, WALL, WALL, WALL ; 20

-	tilecoll WALL, WALL, WALL, WALL ; 21

-	tilecoll WALL, WALL, WALL, WALL ; 22

-	tilecoll WALL, WALL, WALL, WALL ; 23

-	tilecoll WALL, WALL, WALL, WALL ; 24

-	tilecoll WALL, WALL, WALL, WALL ; 25

-	tilecoll WALL, WALL, WALL, WALL ; 26

-	tilecoll WALL, WALL, WALL, WALL ; 27

-	tilecoll WALL, WALL, DOOR, WALL ; 28

-	tilecoll WALL, WALL, WALL, DOOR ; 29

-	tilecoll WALL, WALL, WALL, WALL ; 2a

-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2b

-	tilecoll WALL, WALL, WALL, WALL ; 2c

-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2d

-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2e

-	tilecoll WALL, WALL, WALL, DOOR ; 2f

-	tilecoll WALL, WALL, WALL, WALL ; 30

-	tilecoll BUOY, BUOY, BUOY, WATER ; 31

-	tilecoll BUOY, BUOY, WATER, WATER ; 32

-	tilecoll BUOY, BUOY, WATER, BUOY ; 33

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 34

-	tilecoll BUOY, WATER, BUOY, WATER ; 35

-	tilecoll WATER, WATER, WATER, WATER ; 36

-	tilecoll WATER, BUOY, WATER, BUOY ; 37

-	tilecoll WALL, WALL, WALL, DOOR ; 38

-	tilecoll BUOY, WATER, BUOY, BUOY ; 39

-	tilecoll WATER, WATER, BUOY, BUOY ; 3a

-	tilecoll WATER, BUOY, BUOY, BUOY ; 3b

-	tilecoll WALL, WALL, WALL, WALL ; 3c

-	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3d

-	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3e

-	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3f

-	tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 40

-	tilecoll WALL, WALL, WALL, FLOOR ; 41

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 42

-	tilecoll WALL, WALL, FLOOR, WALL ; 43

-	tilecoll WATER, WATER, WATER, WATER ; 44

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 45

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 47

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48

-	tilecoll WALL, FLOOR, WALL, WALL ; 49

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 4a

-	tilecoll FLOOR, WALL, WALL, WALL ; 4b

-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c

-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d

-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e

-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f

-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50

-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51

-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52

-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53

-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54

-	tilecoll WATER, WATER, WATER, WATER ; 55

-	tilecoll WATER, WATER, WATER, WATER ; 56

-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57

-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58

-	tilecoll WATER, WATER, WATER, WATER ; 59

-	tilecoll WATER, WATER, WATER, WATER ; 5a

-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b

-	tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5c

-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5d

-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5e

-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5f

-	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 60

-	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 61

-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 62

-	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 63

-	tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 64

-	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65

-	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 66

-	tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 67

-	tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 68

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 69

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 6a

-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b

-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c

-	tilecoll WALL, FLOOR, WALL, WALL ; 6d

-	tilecoll FLOOR, WALL, WALL, WALL ; 6e

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70

-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 73

-	tilecoll FLOOR, FLOOR, CAVE, WALL ; 74

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 76

-	tilecoll WATER, WATER, WATER, WATER ; 77

-	tilecoll WALL, WALL, DOOR, WALL ; 78

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79

-	tilecoll WATER, WATER, WATER, WATER ; 7a

-	tilecoll WATER, WATER, WATER, WATER ; 7b

-	tilecoll WALL, WALL, WALL, WALL ; 7c

-	tilecoll WALL, WALL, WALL, WALL ; 7d

-	tilecoll WALL, WALL, WALL, WALL ; 7e

-	tilecoll WALL, WALL, WALL, WALL ; 7f

-	tilecoll WALL, WALL, WALL, WALL ; 80

binary files a/data/tilesets/johto_1_metatiles.bin /dev/null differ

--- a/data/tilesets/johto_2_collision.asm

+++ /dev/null

@@ -1,128 +1,0 @@

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

-	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

-	tilecoll WALL, WALL, WALL, WALL ; 06

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08

-	tilecoll WALL, WALL, WALL, WALL ; 09

-	tilecoll WALL, WALL, WALL, WALL ; 0a

-	tilecoll WALL, WALL, WALL, WALL ; 0b

-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c

-	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e

-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f

-	tilecoll WALL, WALL, WALL, WALL ; 10

-	tilecoll WALL, WALL, WALL, WALL ; 11

-	tilecoll WALL, WALL, WALL, WALL ; 12

-	tilecoll WALL, WALL, WALL, WALL ; 13

-	tilecoll WALL, WALL, WALL, WALL ; 14

-	tilecoll WALL, WALL, WALL, DOOR ; 15

-	tilecoll WALL, WALL, WALL, WALL ; 16

-	tilecoll WALL, WALL, WALL, DOOR ; 17

-	tilecoll WALL, WALL, DOOR, WALL ; 18

-	tilecoll WALL, WALL, WALL, WALL ; 19

-	tilecoll WALL, WALL, WALL, WALL ; 1a

-	tilecoll WALL, WALL, WALL, DOOR ; 1b

-	tilecoll WALL, WALL, WALL, WALL ; 1c

-	tilecoll WALL, WALL, WALL, WALL ; 1d

-	tilecoll WALL, WALL, DOOR, WALL ; 1e

-	tilecoll WALL, WALL, WALL, WALL ; 1f

-	tilecoll WALL, WALL, WALL, WALL ; 20

-	tilecoll WALL, WALL, WALL, WALL ; 21

-	tilecoll WALL, WALL, WALL, WALL ; 22

-	tilecoll WALL, WALL, WALL, WALL ; 23

-	tilecoll WALL, WALL, WALL, WALL ; 24

-	tilecoll WALL, WALL, DOOR, WALL ; 25

-	tilecoll WALL, WALL, WALL, WALL ; 26

-	tilecoll WALL, WALL, WALL, WALL ; 27

-	tilecoll WALL, WALL, WALL, WALL ; 28

-	tilecoll WALL, WALL, WALL, WALL ; 29

-	tilecoll WALL, WALL, WALL, WALL ; 2a

-	tilecoll WALL, WALL, WALL, WALL ; 2b

-	tilecoll WALL, WALL, WALL, WALL ; 2c

-	tilecoll WALL, WALL, WALL, WALL ; 2d

-	tilecoll WALL, WALL, WALL, DOOR ; 2e

-	tilecoll WALL, WALL, WALL, WALL ; 2f

-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 30

-	tilecoll BUOY, BUOY, BUOY, WATER ; 31

-	tilecoll BUOY, BUOY, WATER, WATER ; 32

-	tilecoll BUOY, BUOY, WATER, BUOY ; 33

-	tilecoll WALL, WALL, WALL, WALL ; 34

-	tilecoll BUOY, WATER, BUOY, WATER ; 35

-	tilecoll WATER, WATER, WATER, WATER ; 36

-	tilecoll WATER, BUOY, WATER, BUOY ; 37

-	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 38

-	tilecoll BUOY, WATER, BUOY, BUOY ; 39

-	tilecoll WATER, WATER, BUOY, BUOY ; 3a

-	tilecoll WATER, BUOY, BUOY, BUOY ; 3b

-	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3c

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3d

-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3e

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3f

-	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 40

-	tilecoll WALL, WALL, WALL, FLOOR ; 41

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 42

-	tilecoll WALL, WALL, FLOOR, WALL ; 43

-	tilecoll WATER, WATER, WATER, WATER ; 44

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 45

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 47

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48

-	tilecoll WALL, FLOOR, WALL, WALL ; 49

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 4a

-	tilecoll FLOOR, WALL, WALL, WALL ; 4b

-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c

-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d

-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e

-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f

-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50

-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51

-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52

-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53

-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54

-	tilecoll WATER, WATER, WATER, WATER ; 55

-	tilecoll WATER, WATER, WATER, WATER ; 56

-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57

-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58

-	tilecoll WATER, WATER, WATER, WATER ; 59

-	tilecoll WATER, WATER, WATER, WATER ; 5a

-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b

-	tilecoll WALL, WALL, WALL, CAVE ; 5c

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 5d

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5e

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5f

-	tilecoll WALL, WALL, WALL, WALL ; 60

-	tilecoll WATER, WATER, WALL, WALL ; 61

-	tilecoll WATER, WATER, WALL, WALL ; 62

-	tilecoll WATER, WATER, WALL, WALL ; 63

-	tilecoll WATER, WATER, WATER, WATER ; 64

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 65

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 66

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 67

-	tilecoll WALL, WALL, WALL, WALL ; 68

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 69

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 6a

-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b

-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c

-	tilecoll WALL, FLOOR, WALL, WALL ; 6d

-	tilecoll FLOOR, WALL, WALL, WALL ; 6e

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70

-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 73

-	tilecoll FLOOR, FLOOR, WALL, CAVE ; 74

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 76

-	tilecoll WATER, WATER, WATER, WATER ; 77

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 78

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 79

-	tilecoll WATER, WATER, WATER, WATER ; 7a

-	tilecoll WATER, WATER, WATER, WATER ; 7b

-	tilecoll WALL, WALL, WALL, WALL ; 7c

-	tilecoll WALL, WALL, WALL, WALL ; 7d

-	tilecoll WALL, WALL, WALL, WALL ; 7e

-	tilecoll WALL, WALL, WALL, WALL ; 7f

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80

binary files a/data/tilesets/johto_2_metatiles.bin /dev/null differ

--- /dev/null

+++ b/data/tilesets/johto_collision.asm

@@ -1,0 +1,128 @@

+	tilecoll 01, 01, 01, 01 ; 01

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

+	tilecoll WALL, WALL, WALL, WALL ; 06

+	tilecoll LADDER, LADDER, LADDER, LADDER ; 07

+	tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 08

+	tilecoll WALL, WALL, WALL, WALL ; 09

+	tilecoll WALL, WALL, WALL, WALL ; 0a

+	tilecoll WALL, WALL, WALL, WALL ; 0b

+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c

+	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e

+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f

+	tilecoll WALL, WALL, WALL, WALL ; 10

+	tilecoll WALL, WALL, WALL, WALL ; 11

+	tilecoll WALL, WALL, WALL, WALL ; 12

+	tilecoll WALL, WALL, WALL, WALL ; 13

+	tilecoll WALL, WALL, WALL, WALL ; 14

+	tilecoll WALL, WALL, WALL, DOOR ; 15

+	tilecoll WALL, WALL, WALL, WALL ; 16

+	tilecoll WALL, WALL, WALL, DOOR ; 17

+	tilecoll WALL, WALL, WALL, WALL ; 18

+	tilecoll WALL, WALL, WALL, WALL ; 19

+	tilecoll WALL, WALL, WALL, WALL ; 1a

+	tilecoll WALL, WALL, WALL, DOOR ; 1b

+	tilecoll WALL, WALL, WALL, WALL ; 1c

+	tilecoll WALL, WALL, WALL, WALL ; 1d

+	tilecoll WALL, WALL, DOOR, WALL ; 1e

+	tilecoll WALL, WALL, WALL, WALL ; 1f

+	tilecoll WALL, WALL, WALL, WALL ; 20

+	tilecoll WALL, WALL, WALL, WALL ; 21

+	tilecoll WALL, WALL, WALL, WALL ; 22

+	tilecoll WALL, WALL, WALL, WALL ; 23

+	tilecoll WALL, WALL, WALL, WALL ; 24

+	tilecoll WALL, WALL, WALL, WALL ; 25

+	tilecoll WALL, WALL, WALL, WALL ; 26

+	tilecoll WALL, WALL, WALL, WALL ; 27

+	tilecoll WALL, WALL, DOOR, WALL ; 28

+	tilecoll WALL, WALL, WALL, DOOR ; 29

+	tilecoll WALL, WALL, WALL, WALL ; 2a

+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2b

+	tilecoll WALL, WALL, WALL, WALL ; 2c

+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2d

+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2e

+	tilecoll WALL, WALL, WALL, DOOR ; 2f

+	tilecoll WALL, WALL, WALL, WALL ; 30

+	tilecoll BUOY, BUOY, BUOY, WATER ; 31

+	tilecoll BUOY, BUOY, WATER, WATER ; 32

+	tilecoll BUOY, BUOY, WATER, BUOY ; 33

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 34

+	tilecoll BUOY, WATER, BUOY, WATER ; 35

+	tilecoll WATER, WATER, WATER, WATER ; 36

+	tilecoll WATER, BUOY, WATER, BUOY ; 37

+	tilecoll WALL, WALL, WALL, DOOR ; 38

+	tilecoll BUOY, WATER, BUOY, BUOY ; 39

+	tilecoll WATER, WATER, BUOY, BUOY ; 3a

+	tilecoll WATER, BUOY, BUOY, BUOY ; 3b

+	tilecoll WALL, WALL, WALL, WALL ; 3c

+	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3d

+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3e

+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3f

+	tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 40

+	tilecoll WALL, WALL, WALL, FLOOR ; 41

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 42

+	tilecoll WALL, WALL, FLOOR, WALL ; 43

+	tilecoll WATER, WATER, WATER, WATER ; 44

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 45

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 47

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48

+	tilecoll WALL, FLOOR, WALL, WALL ; 49

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 4a

+	tilecoll FLOOR, WALL, WALL, WALL ; 4b

+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c

+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d

+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e

+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f

+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50

+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51

+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52

+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53

+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54

+	tilecoll WATER, WATER, WATER, WATER ; 55

+	tilecoll WATER, WATER, WATER, WATER ; 56

+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57

+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58

+	tilecoll WATER, WATER, WATER, WATER ; 59

+	tilecoll WATER, WATER, WATER, WATER ; 5a

+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b

+	tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5c

+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5d

+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5e

+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5f

+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 60

+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 61

+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 62

+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 63

+	tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 64

+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65

+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 66

+	tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 67

+	tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 68

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 69

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 6a

+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b

+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c

+	tilecoll WALL, FLOOR, WALL, WALL ; 6d

+	tilecoll FLOOR, WALL, WALL, WALL ; 6e

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70

+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 73

+	tilecoll FLOOR, FLOOR, CAVE, WALL ; 74

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 76

+	tilecoll WATER, WATER, WATER, WATER ; 77

+	tilecoll WALL, WALL, DOOR, WALL ; 78

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79

+	tilecoll WATER, WATER, WATER, WATER ; 7a

+	tilecoll WATER, WATER, WATER, WATER ; 7b

+	tilecoll WALL, WALL, WALL, WALL ; 7c

+	tilecoll WALL, WALL, WALL, WALL ; 7d

+	tilecoll WALL, WALL, WALL, WALL ; 7e

+	tilecoll WALL, WALL, WALL, WALL ; 7f

+	tilecoll WALL, WALL, WALL, WALL ; 80

binary files /dev/null b/data/tilesets/johto_metatiles.bin differ

--- /dev/null

+++ b/data/tilesets/johto_modern_collision.asm

@@ -1,0 +1,128 @@

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

+	tilecoll WALL, WALL, WALL, WALL ; 06

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08

+	tilecoll WALL, WALL, WALL, WALL ; 09

+	tilecoll WALL, WALL, WALL, WALL ; 0a

+	tilecoll WALL, WALL, WALL, WALL ; 0b

+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c

+	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e

+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f

+	tilecoll WALL, WALL, WALL, WALL ; 10

+	tilecoll WALL, WALL, WALL, WALL ; 11

+	tilecoll WALL, WALL, WALL, WALL ; 12

+	tilecoll WALL, WALL, WALL, WALL ; 13

+	tilecoll WALL, WALL, WALL, WALL ; 14

+	tilecoll WALL, WALL, WALL, DOOR ; 15

+	tilecoll WALL, WALL, WALL, WALL ; 16

+	tilecoll WALL, WALL, WALL, DOOR ; 17

+	tilecoll WALL, WALL, DOOR, WALL ; 18

+	tilecoll WALL, WALL, WALL, WALL ; 19

+	tilecoll WALL, WALL, WALL, WALL ; 1a

+	tilecoll WALL, WALL, WALL, DOOR ; 1b

+	tilecoll WALL, WALL, WALL, WALL ; 1c

+	tilecoll WALL, WALL, WALL, WALL ; 1d

+	tilecoll WALL, WALL, DOOR, WALL ; 1e

+	tilecoll WALL, WALL, WALL, WALL ; 1f

+	tilecoll WALL, WALL, WALL, WALL ; 20

+	tilecoll WALL, WALL, WALL, WALL ; 21

+	tilecoll WALL, WALL, WALL, WALL ; 22

+	tilecoll WALL, WALL, WALL, WALL ; 23

+	tilecoll WALL, WALL, WALL, WALL ; 24

+	tilecoll WALL, WALL, DOOR, WALL ; 25

+	tilecoll WALL, WALL, WALL, WALL ; 26

+	tilecoll WALL, WALL, WALL, WALL ; 27

+	tilecoll WALL, WALL, WALL, WALL ; 28

+	tilecoll WALL, WALL, WALL, WALL ; 29

+	tilecoll WALL, WALL, WALL, WALL ; 2a

+	tilecoll WALL, WALL, WALL, WALL ; 2b

+	tilecoll WALL, WALL, WALL, WALL ; 2c

+	tilecoll WALL, WALL, WALL, WALL ; 2d

+	tilecoll WALL, WALL, WALL, DOOR ; 2e

+	tilecoll WALL, WALL, WALL, WALL ; 2f

+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 30

+	tilecoll BUOY, BUOY, BUOY, WATER ; 31

+	tilecoll BUOY, BUOY, WATER, WATER ; 32

+	tilecoll BUOY, BUOY, WATER, BUOY ; 33

+	tilecoll WALL, WALL, WALL, WALL ; 34

+	tilecoll BUOY, WATER, BUOY, WATER ; 35

+	tilecoll WATER, WATER, WATER, WATER ; 36

+	tilecoll WATER, BUOY, WATER, BUOY ; 37

+	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 38

+	tilecoll BUOY, WATER, BUOY, BUOY ; 39

+	tilecoll WATER, WATER, BUOY, BUOY ; 3a

+	tilecoll WATER, BUOY, BUOY, BUOY ; 3b

+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3c

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3d

+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3e

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3f

+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 40

+	tilecoll WALL, WALL, WALL, FLOOR ; 41

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 42

+	tilecoll WALL, WALL, FLOOR, WALL ; 43

+	tilecoll WATER, WATER, WATER, WATER ; 44

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 45

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 47

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48

+	tilecoll WALL, FLOOR, WALL, WALL ; 49

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 4a

+	tilecoll FLOOR, WALL, WALL, WALL ; 4b

+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c

+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d

+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e

+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f

+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50

+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51

+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52

+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53

+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54

+	tilecoll WATER, WATER, WATER, WATER ; 55

+	tilecoll WATER, WATER, WATER, WATER ; 56

+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57

+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58

+	tilecoll WATER, WATER, WATER, WATER ; 59

+	tilecoll WATER, WATER, WATER, WATER ; 5a

+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b

+	tilecoll WALL, WALL, WALL, CAVE ; 5c

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 5d

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5e

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5f

+	tilecoll WALL, WALL, WALL, WALL ; 60

+	tilecoll WATER, WATER, WALL, WALL ; 61

+	tilecoll WATER, WATER, WALL, WALL ; 62

+	tilecoll WATER, WATER, WALL, WALL ; 63

+	tilecoll WATER, WATER, WATER, WATER ; 64

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 65

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 66

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 67

+	tilecoll WALL, WALL, WALL, WALL ; 68

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 69

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 6a

+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b

+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c

+	tilecoll WALL, FLOOR, WALL, WALL ; 6d

+	tilecoll FLOOR, WALL, WALL, WALL ; 6e

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70

+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 73

+	tilecoll FLOOR, FLOOR, WALL, CAVE ; 74

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 76

+	tilecoll WATER, WATER, WATER, WATER ; 77

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 78

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 79

+	tilecoll WATER, WATER, WATER, WATER ; 7a

+	tilecoll WATER, WATER, WATER, WATER ; 7b

+	tilecoll WALL, WALL, WALL, WALL ; 7c

+	tilecoll WALL, WALL, WALL, WALL ; 7d

+	tilecoll WALL, WALL, WALL, WALL ; 7e

+	tilecoll WALL, WALL, WALL, WALL ; 7f

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80

binary files /dev/null b/data/tilesets/johto_modern_metatiles.bin differ

--- a/data/tilesets/kurts_house_collision.asm

+++ /dev/null

@@ -1,64 +1,0 @@

-	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, RADIO, FLOOR ; 02

-	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 03

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 04

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06

-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 08

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 09

-	tilecoll WALL, WALL, WALL, WALL ; 0a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 0c

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f

-	tilecoll WALL, WALL, WALL, WALL ; 10

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 12

-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 13

-	tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 14

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 15

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17

-	tilecoll WALL, WALL, WALL, WALL ; 18

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a

-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1c

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21

-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 22

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 23

-	tilecoll WALL, WALL, RADIO, FLOOR ; 24

-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 26

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 27

-	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 28

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 29

-	tilecoll WALL, WALL, WALL, WALL ; 2a

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c

-	tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2d

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2f

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 31

-	tilecoll WALL, WALL, WALL, WALL ; 32

-	tilecoll WALL, WALL, WALL, WALL ; 33

-	tilecoll WALL, WALL, WALL, FLOOR ; 34

-	tilecoll WALL, WALL, WALL, FLOOR ; 35

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 36

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37

-	tilecoll WALL, WALL, FLOOR, WALL ; 38

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 39

-	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 3a

-	tilecoll 04, 03, 03, 03 ; 3b

-	tilecoll 03, 03, 03, 03 ; 3c

-	tilecoll 03, 03, 04, 04 ; 3d

-	tilecoll 04, 04, 04, 04 ; 3e

-	tilecoll 03, 03, 03, 03 ; 3f

-	tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 40

binary files a/data/tilesets/kurts_house_metatiles.bin /dev/null differ

--- /dev/null

+++ b/data/tilesets/mansion_collision.asm

@@ -1,0 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 01

+	tilecoll WALL, WALL, WALL, WALL ; 02

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 05

+	tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 07

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 08

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 09

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0a

+	tilecoll WALL, WALL, FLOOR, WALL ; 0b

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0c

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d

+	tilecoll WALL, WALL, FLOOR, WALL ; 0e

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0f

+	tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 10

+	tilecoll WALL, WALL, WALL, WALL ; 11

+	tilecoll WALL, WALL, BOOKSHELF, WALL ; 12

+	tilecoll WALL, WALL, WALL, WALL ; 13

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 15

+	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 16

+	tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 17

+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 18

+	tilecoll WALL, WALL, BOOKSHELF, WALL ; 19

+	tilecoll WALL, WALL, WALL, WALL ; 1a

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1d

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1e

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1f

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 20

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 21

+	tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 22

+	tilecoll WALL, WALL, FLOOR, WALL ; 23

+	tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 24

+	tilecoll WALL, WALL, WALL, STAIRCASE ; 25

+	tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 26

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 27

+	tilecoll WALL, WALL, DOOR, WALL ; 28

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 29

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2a

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2b

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c

+	tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2d

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f

+	tilecoll WALL, WALL, WALL, FLOOR ; 30

+	tilecoll WALL, WALL, FLOOR, WALL ; 31

+	tilecoll WALL, WALL, FLOOR, WALL ; 32

+	tilecoll WALL, WALL, WALL, WALL ; 33

+	tilecoll WALL, WALL, WALL, FLOOR ; 34

+	tilecoll WALL, WALL, WALL, WALL ; 35

+	tilecoll FLOOR, WALL, WALL, WALL ; 36

+	tilecoll WALL, WALL, FLOOR, WALL ; 37

+	tilecoll WALL, FLOOR, WALL, WALL ; 38

+	tilecoll WALL, WALL, FLOOR, WALL ; 39

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 3a

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 3b

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d

+	tilecoll WALL, FLOOR, WALL, WALL ; 3e

+	tilecoll FLOOR, WALL, WALL, WALL ; 3f

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 40

binary files /dev/null b/data/tilesets/mansion_metatiles.bin differ

--- a/data/tilesets/olivine_gym_collision.asm

+++ /dev/null

@@ -1,64 +1,0 @@

-	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, FLOOR, WALL ; 02

-	tilecoll WALL, WALL, WALL, FLOOR ; 03

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 04

-	tilecoll WALL, WALL, WALL, WALL ; 05

-	tilecoll WALL, WALL, COUNTER, FLOOR ; 06

-	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 07

-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 09

-	tilecoll WALL, FLOOR, FLOOR, WALL ; 0a

-	tilecoll WALL, WALL, WALL, WALL ; 0b

-	tilecoll WALL, WALL, LADDER, LADDER ; 0c

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0d

-	tilecoll WALL, WALL, WALL, WALL ; 0e

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f

-	tilecoll WALL, WALL, WALL, WALL ; 10

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11

-	tilecoll WALL, WALL, WALL, FLOOR ; 12

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13

-	tilecoll WALL, WALL, FLOOR, WALL ; 14

-	tilecoll WALL, FLOOR, WALL, WALL ; 15

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 17

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 19

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1b

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1c

-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 1d

-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1e

-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 1f

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20

-	tilecoll WALL, FLOOR, WALL, WALL ; 21

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22

-	tilecoll FLOOR, WALL, WALL, WALL ; 23

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 25

-	tilecoll WALL, WALL, WALL, WALL ; 26

-	tilecoll WALL, WALL, WALL, WALL ; 27

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 28

-	tilecoll WALL, WALL, WALL, WALL ; 29

-	tilecoll WALL, WALL, WALL, WALL ; 2a

-	tilecoll WALL, WALL, WALL, WALL ; 2b

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 2c

-	tilecoll WALL, WALL, WALL, WALL ; 2d

-	tilecoll WALL, WALL, WALL, WALL ; 2e

-	tilecoll WALL, WALL, WALL, WALL ; 2f

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 30

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 31

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 34

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 35

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 36

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 37

-	tilecoll FLOOR, WALL, WALL, WALL ; 38

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 39

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 3a

-	tilecoll WALL, WALL, WALL, WALL ; 3b

-	tilecoll WALL, WALL, WALL, WALL ; 3c

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e

-	tilecoll WALL, FLOOR, WALL, WALL ; 3f

-	tilecoll FLOOR, WALL, WALL, WALL ; 40

--- a/data/tilesets/olivine_gym_metatiles.bin

+++ /dev/null

@@ -1,15 +1,0 @@

-
 *()  89+,!!          


%'!!	 5 5 5 5 5&&01                    %&&'677:"##$2334������ַ��������
        +,+, *()  89        SSSSSSSSSSSSSSSSFGFGVWVWFGSSVWSS                FGFGVWVWSSFGSSVW�]���]]]%&&'XYXYѣ�ѥ�����������SSSSSSSSFGFGVWVW����������������FGSSVWSSFGSSVWSSSSFGSSVWSSFGSSVW./SS>?SSNOSS^_SSSS./SS>?SSNOSS^_S@HH@PQQPPQQPPQQHHHHQQQQQQQQQQQQHHBSQQRBQQRRQQRR----------------PPQQPPQQPCDDCDDDQQQQQQQQTUTUTUTUQQRRQQRRDDERDDDESSSSSSSS

-SS

-SS

-SSSS

-FG

-VW

-FG

-VWFG

-VW

-FG

-VW

-SS

-SS

-SS

-SSʰ��˱ݱ̲޲�������αݱϲ޲�����FGFGVWVWFGFGVWVW����]]]]%&&'XYXY����ݱ��޲�������°��ı��Ʋ����������������������]���]���]���]����]���]���]���]�;<<=;<<=;<<=;<<=����������������````````````````;<<=;<<=%&&'XYXY����������������������������������]�]]]�%&&'XYXY�]���]]��]]��]����]��]]��]]���]��]���]���]���]����]���]���]���]���������������������;<<=�����������Ӣ��ґ���������ӡ��Ӣ�������

\ No newline at end of file

--- a/data/tilesets/players_house_2f_collision.asm

+++ /dev/null

@@ -1,64 +1,0 @@

-	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, WALL, WALL ; 02

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03

-	tilecoll WALL, WALL, TV, BOOKSHELF ; 04

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 05

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 08

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 09

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0c

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 0f

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 12

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 15

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 18

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1e

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1f

-	tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 20

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 23

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 24

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 25

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 26

-	tilecoll FF, FF, FF, FF ; 27

-	tilecoll FF, FF, FF, FF ; 28

-	tilecoll FF, FF, FF, FF ; 29

-	tilecoll FF, FF, FF, FF ; 2a

-	tilecoll FF, FF, FF, FF ; 2b

-	tilecoll FF, FF, FF, FF ; 2c

-	tilecoll FF, FF, FF, FF ; 2d

-	tilecoll FF, FF, FF, FF ; 2e

-	tilecoll FF, FF, FF, FF ; 2f

-	tilecoll FF, FF, FF, FF ; 30

-	tilecoll FF, FF, FF, FF ; 31

-	tilecoll FF, FF, FF, FF ; 32

-	tilecoll FF, FF, FF, FF ; 33

-	tilecoll FF, FF, FF, FF ; 34

-	tilecoll FF, FF, FF, FF ; 35

-	tilecoll FF, FF, FF, FF ; 36

-	tilecoll FF, FF, FF, FF ; 37

-	tilecoll FF, FF, FF, FF ; 38

-	tilecoll FF, FF, FF, FF ; 39

-	tilecoll FF, FF, FF, FF ; 3a

-	tilecoll FF, FF, FF, FF ; 3b

-	tilecoll FF, FF, FF, FF ; 3c

-	tilecoll FF, FF, FF, FF ; 3d

-	tilecoll FF, FF, FF, FF ; 3e

-	tilecoll FF, FF, FF, FF ; 3f

-	tilecoll FF, FF, FF, FF ; 40

binary files a/data/tilesets/players_house_2f_metatiles.bin /dev/null differ

--- /dev/null

+++ b/data/tilesets/players_room_collision.asm

@@ -1,0 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 01

+	tilecoll WALL, WALL, WALL, WALL ; 02

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03

+	tilecoll WALL, WALL, TV, BOOKSHELF ; 04

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 05

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 08

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 09

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0c

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0f

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 12

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 15

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 18

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1c

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1e

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1f

+	tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 20

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 23

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 24

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 25

+	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 26

+	tilecoll FF, FF, FF, FF ; 27

+	tilecoll FF, FF, FF, FF ; 28

+	tilecoll FF, FF, FF, FF ; 29

+	tilecoll FF, FF, FF, FF ; 2a

+	tilecoll FF, FF, FF, FF ; 2b

+	tilecoll FF, FF, FF, FF ; 2c

+	tilecoll FF, FF, FF, FF ; 2d

+	tilecoll FF, FF, FF, FF ; 2e

+	tilecoll FF, FF, FF, FF ; 2f

+	tilecoll FF, FF, FF, FF ; 30

+	tilecoll FF, FF, FF, FF ; 31

+	tilecoll FF, FF, FF, FF ; 32

+	tilecoll FF, FF, FF, FF ; 33

+	tilecoll FF, FF, FF, FF ; 34

+	tilecoll FF, FF, FF, FF ; 35

+	tilecoll FF, FF, FF, FF ; 36

+	tilecoll FF, FF, FF, FF ; 37

+	tilecoll FF, FF, FF, FF ; 38

+	tilecoll FF, FF, FF, FF ; 39

+	tilecoll FF, FF, FF, FF ; 3a

+	tilecoll FF, FF, FF, FF ; 3b

+	tilecoll FF, FF, FF, FF ; 3c

+	tilecoll FF, FF, FF, FF ; 3d

+	tilecoll FF, FF, FF, FF ; 3e

+	tilecoll FF, FF, FF, FF ; 3f

+	tilecoll FF, FF, FF, FF ; 40

binary files /dev/null b/data/tilesets/players_room_metatiles.bin differ

--- a/data/tilesets/power_plant_collision.asm

+++ /dev/null

@@ -1,64 +1,0 @@

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 02

-	tilecoll WALL, WALL, WALL, WALL ; 03

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04

-	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 05

-	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 06

-	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 07

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 09

-	tilecoll WALL, WALL, WALL, FLOOR ; 0a

-	tilecoll WALL, WALL, FLOOR, WALL ; 0b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 0e

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0f

-	tilecoll WALL, WALL, WALL, WALL ; 10

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 12

-	tilecoll WALL, WALL, WALL, WALL ; 13

-	tilecoll WALL, WALL, WALL, WALL ; 14

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 16

-	tilecoll WALL, WALL, WALL, WALL ; 17

-	tilecoll WALL, WALL, WALL, WALL ; 18

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 19

-	tilecoll WALL, WALL, WALL, WALL ; 1a

-	tilecoll WALL, WALL, WALL, FLOOR ; 1b

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d

-	tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1e

-	tilecoll WALL, WALL, FLOOR, COUNTER ; 1f

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 20

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 21

-	tilecoll WALL, WALL, WALL, FLOOR ; 22

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 23

-	tilecoll WALL, FLOOR, WALL, WALL ; 24

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 25

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 26

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 27

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 29

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2a

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2c

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2d

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 2f

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 30

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31

-	tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 32

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 33

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 34

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 35

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 36

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 37

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 38

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 39

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 3a

-	tilecoll FLOOR, WALL, WALL, WALL ; 3b

-	tilecoll WALL, WALL, FLOOR, WALL ; 3c

-	tilecoll WALL, WALL, WALL, FLOOR ; 3d

-	tilecoll WALL, WALL, FLOOR, WALL ; 3e

-	tilecoll WALL, FLOOR, WALL, WALL ; 3f

-	tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40

--- a/data/tilesets/power_plant_metatiles.bin

+++ /dev/null

@@ -1,8 +1,0 @@

-6666666666666666""""""""&&&&@B@B

-&&&&88889999&& !&&&&&01&&&&&@B@B()()()()*+()&&&&&&&&	&&,-""<=""./&>?&"",-""<=&./&>?







&&&&''''7777,-&<=&./&>?&&,-&<=&./&>?@AABPQQRPHIRS::T&&&@A&PQ&&AAABQQQREEFEUUVU

-K

-[EFEEUVUUK

-[&PQ&S:&&QQQR:::T&&EFE;UVU;JKJ;Z[Z;6666666666666666AAABMMMN88889999""""""""#$$%WXXY""""@B""PRPRPRPRPR""23""CD&&&&""""""@B&PR&PR;;;;;;;;&&&&&&&&;;;;;;;;""""@B""PR&PR&PR&PR&PR&PR&PR&PR&PR@APRLM&&&&&@A&LM&&&&AB&MN&&&&&@B@APRLM&&&&	&&@AABPHIR	&&&&&&@B&PR&PR&PR&PR&&@BPR#$$%WXXY&&&&PRPRPRPR@B&PR&PR&PR&@AAALMMM&&&&AAABMMMN&&&&&@B&PR&PR&PR&&&&AAAAMMMM""""""""&&AAAAMMMM&&&&&PR&PR&PR&PR&@A&PQ&PQ&S:@AAALMMM88889999&PR&PRABPRMNPR""""""\]&^_&@B@APRLMPR&PR&AB@BMNPR&PR&PRPR&PR&PR@ALM&PR&PRABPRMN

\ No newline at end of file

--- a/data/tilesets/sprout_tower_collision.asm

+++ /dev/null

@@ -1,64 +1,0 @@

-	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, WALL, WALL ; 02

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04

-	tilecoll WALL, WALL, WALL, FLOOR ; 05

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 06

-	tilecoll WALL, WALL, FLOOR, WALL ; 07

-	tilecoll WALL, WALL, WALL, WALL ; 08

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 09

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b

-	tilecoll WALL, WALL, WALL, WALL ; 0c

-	tilecoll WALL, FLOOR, WALL, WALL ; 0d

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e

-	tilecoll FLOOR, WALL, WALL, WALL ; 0f

-	tilecoll WALL, WALL, WALL, WALL ; 10

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 11

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 12

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 13

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 14

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16

-	tilecoll WALL, FLOOR, WALL, WALL ; 17

-	tilecoll FLOOR, WALL, WALL, WALL ; 18

-	tilecoll WALL, WALL, WALL, WALL ; 19

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b

-	tilecoll WALL, WALL, WALL, WALL ; 1c

-	tilecoll WALL, WALL, WALL, WALL ; 1d

-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1e

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1f

-	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 20

-	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 21

-	tilecoll WALL, WALL, WALL, FLOOR ; 22

-	tilecoll WALL, WALL, FLOOR, WALL ; 23

-	tilecoll WALL, WALL, WALL, WALL ; 24

-	tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 25

-	tilecoll WALL, WALL, PIT, FLOOR ; 26

-	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 27

-	tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 28

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a

-	tilecoll WALL, WALL, WALL, WALL ; 2b

-	tilecoll WALL, HOP_LEFT, WALL, WALL ; 2c

-	tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2d

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e

-	tilecoll WALL, WALL, WALL, FLOOR ; 2f

-	tilecoll WALL, WALL, FLOOR, WALL ; 30

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 31

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 32

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 33

-	tilecoll WALL, WALL, WALL, FLOOR ; 34

-	tilecoll WALL, WALL, FLOOR, WALL ; 35

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 36

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 37

-	tilecoll PIT, PIT, FLOOR, FLOOR ; 38

-	tilecoll FLOOR, PIT, FLOOR, PIT ; 39

-	tilecoll PIT, FLOOR, PIT, FLOOR ; 3a

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 3c

-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3d

-	tilecoll WALL, HOP_DOWN, WALL, WALL ; 3e

-	tilecoll HOP_DOWN, WALL, WALL, WALL ; 3f

-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 40

--- a/data/tilesets/sprout_tower_metatiles.bin

+++ /dev/null

@@ -1,2 +1,0 @@

-
@ !!A1A1!!!!!!@ A1A1

-A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!!-.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$	
"#23!!67"#!!2367%545%545%545%545	^^		��������������������������������FVGWPQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFVGW

\ No newline at end of file

--- /dev/null

+++ b/data/tilesets/tower_collision.asm

@@ -1,0 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 01

+	tilecoll WALL, WALL, WALL, WALL ; 02

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04

+	tilecoll WALL, WALL, WALL, FLOOR ; 05

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 06

+	tilecoll WALL, WALL, FLOOR, WALL ; 07

+	tilecoll WALL, WALL, WALL, WALL ; 08

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 09

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b

+	tilecoll WALL, WALL, WALL, WALL ; 0c

+	tilecoll WALL, FLOOR, WALL, WALL ; 0d

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e

+	tilecoll FLOOR, WALL, WALL, WALL ; 0f

+	tilecoll WALL, WALL, WALL, WALL ; 10

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 11

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 12

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 13

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 14

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16

+	tilecoll WALL, FLOOR, WALL, WALL ; 17

+	tilecoll FLOOR, WALL, WALL, WALL ; 18

+	tilecoll WALL, WALL, WALL, WALL ; 19

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 1a

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1b

+	tilecoll WALL, WALL, WALL, WALL ; 1c

+	tilecoll WALL, WALL, WALL, WALL ; 1d

+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1e

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1f

+	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 20

+	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 21

+	tilecoll WALL, WALL, WALL, FLOOR ; 22

+	tilecoll WALL, WALL, FLOOR, WALL ; 23

+	tilecoll WALL, WALL, WALL, WALL ; 24

+	tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 25

+	tilecoll WALL, WALL, PIT, FLOOR ; 26

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 27

+	tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 28

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a

+	tilecoll WALL, WALL, WALL, WALL ; 2b

+	tilecoll WALL, HOP_LEFT, WALL, WALL ; 2c

+	tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2d

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e

+	tilecoll WALL, WALL, WALL, FLOOR ; 2f

+	tilecoll WALL, WALL, FLOOR, WALL ; 30

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 31

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 32

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 33

+	tilecoll WALL, WALL, WALL, FLOOR ; 34

+	tilecoll WALL, WALL, FLOOR, WALL ; 35

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 36

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 37

+	tilecoll PIT, PIT, FLOOR, FLOOR ; 38

+	tilecoll FLOOR, PIT, FLOOR, PIT ; 39

+	tilecoll PIT, FLOOR, PIT, FLOOR ; 3a

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 3c

+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3d

+	tilecoll WALL, HOP_DOWN, WALL, WALL ; 3e

+	tilecoll HOP_DOWN, WALL, WALL, WALL ; 3f

+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 40

--- /dev/null

+++ b/data/tilesets/tower_metatiles.bin

@@ -1,0 +1,2 @@

+
@ !!A1A1!!!!!!@ A1A1

+A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!!-.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$	
"#23!!67"#!!2367%545%545%545%545	^^		��������������������������������FVGWPQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFVGW

\ No newline at end of file

--- /dev/null

+++ b/data/tilesets/traditional_house_collision.asm

@@ -1,0 +1,64 @@

+	tilecoll WALL, WALL, WALL, WALL ; 01

+	tilecoll WALL, WALL, RADIO, FLOOR ; 02

+	tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 03

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06

+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 08

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 09

+	tilecoll WALL, WALL, WALL, WALL ; 0a

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 0c

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f

+	tilecoll WALL, WALL, WALL, WALL ; 10

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 12

+	tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 13

+	tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 14

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 15

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17

+	tilecoll WALL, WALL, WALL, WALL ; 18

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a

+	tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1c

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e

+	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21

+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 22

+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 23

+	tilecoll WALL, WALL, RADIO, FLOOR ; 24

+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 26

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 27

+	tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 28

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 29

+	tilecoll WALL, WALL, WALL, WALL ; 2a

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c

+	tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2d

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2e

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2f

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 31

+	tilecoll WALL, WALL, WALL, WALL ; 32

+	tilecoll WALL, WALL, WALL, WALL ; 33

+	tilecoll WALL, WALL, WALL, FLOOR ; 34

+	tilecoll WALL, WALL, WALL, FLOOR ; 35

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 36

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37

+	tilecoll WALL, WALL, FLOOR, WALL ; 38

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 39

+	tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 3a

+	tilecoll 04, 03, 03, 03 ; 3b

+	tilecoll 03, 03, 03, 03 ; 3c

+	tilecoll 03, 03, 04, 04 ; 3d

+	tilecoll 04, 04, 04, 04 ; 3e

+	tilecoll 03, 03, 03, 03 ; 3f

+	tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 40

binary files /dev/null b/data/tilesets/traditional_house_metatiles.bin differ

--- /dev/null

+++ b/data/tilesets/unused_dark_cave_collision.asm

@@ -1,0 +1,128 @@

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

+	tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 04

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

+	tilecoll WALL, WALL, WALL, WALL ; 06

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08

+	tilecoll WALL, WALL, WALL, WALL ; 09

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a

+	tilecoll WALL, WALL, WALL, WALL ; 0b

+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0d

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e

+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f

+	tilecoll WALL, WALL, WALL, WALL ; 10

+	tilecoll WALL, WALL, WALL, WALL ; 11

+	tilecoll WALL, WALL, WALL, WALL ; 12

+	tilecoll WALL, WALL, WALL, WALL ; 13

+	tilecoll WALL, WALL, WALL, WALL ; 14

+	tilecoll WALL, WALL, WALL, DOOR ; 15

+	tilecoll WALL, WALL, WALL, WALL ; 16

+	tilecoll WALL, WALL, WALL, DOOR ; 17

+	tilecoll WALL, WALL, TOWN_MAP, WALL ; 18

+	tilecoll WALL, WALL, WALL, WALL ; 19

+	tilecoll WALL, WALL, WALL, WALL ; 1a

+	tilecoll WALL, WALL, WALL, DOOR ; 1b

+	tilecoll WALL, WALL, TOWN_MAP, WALL ; 1c

+	tilecoll WALL, WALL, WALL, WALL ; 1d

+	tilecoll WALL, WALL, DOOR, WALL ; 1e

+	tilecoll WALL, WALL, WALL, WALL ; 1f

+	tilecoll WALL, WALL, WALL, WALL ; 20

+	tilecoll WALL, WALL, WALL, WALL ; 21

+	tilecoll WALL, WALL, WALL, WALL ; 22

+	tilecoll WALL, WALL, WALL, WALL ; 23

+	tilecoll WALL, WALL, WALL, WALL ; 24

+	tilecoll WALL, WALL, WALL, WALL ; 25

+	tilecoll WALL, WALL, WALL, WALL ; 26

+	tilecoll WALL, WALL, WALL, WALL ; 27

+	tilecoll WALL, WALL, WALL, WALL ; 28

+	tilecoll WALL, WALL, WALL, DOOR ; 29

+	tilecoll WALL, WALL, WALL, WALL ; 2a

+	tilecoll WALL, WALL, WALL, DOOR ; 2b

+	tilecoll WALL, WALL, WALL, WALL ; 2c

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2d

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2e

+	tilecoll WALL, WALL, WALL, DOOR ; 2f

+	tilecoll WALL, WALL, WALL, WALL ; 30

+	tilecoll BUOY, BUOY, BUOY, WATER_21 ; 31

+	tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 32

+	tilecoll BUOY, BUOY, WATER_21, BUOY ; 33

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 34

+	tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 35

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 36

+	tilecoll WATER_21, BUOY, WATER_21, BUOY ; 37

+	tilecoll WALL, WALL, WALL, WALL ; 38

+	tilecoll BUOY, WATER_21, BUOY, BUOY ; 39

+	tilecoll WATER_21, WATER_21, BUOY, BUOY ; 3a

+	tilecoll WATER_21, BUOY, BUOY, BUOY ; 3b

+	tilecoll WALL, WALL, WALL, WALL ; 3c

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d

+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3f

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40

+	tilecoll WALL, WALL, WALL, FLOOR ; 41

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 42

+	tilecoll WALL, WALL, FLOOR, WALL ; 43

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 44

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 45

+	tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 46

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 47

+	tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 48

+	tilecoll WALL, FLOOR, WALL, WALL ; 49

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 4a

+	tilecoll FLOOR, WALL, WALL, WALL ; 4b

+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c

+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d

+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e

+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f

+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50

+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51

+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52

+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53

+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 55

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 56

+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57

+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 59

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 5a

+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b

+	tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5c

+	tilecoll WALL, WALL, WALL, FLOOR ; 5d

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 5e

+	tilecoll WALL, WALL, FLOOR, WALL ; 5f

+	tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 60

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 61

+	tilecoll WALL, WALL, WALL, WALL ; 62

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 63

+	tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 64

+	tilecoll WALL, FLOOR, WALL, WALL ; 65

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 66

+	tilecoll FLOOR, WALL, WALL, WALL ; 67

+	tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 68

+	tilecoll WALL, FLOOR, WALL, FLOOR ; 69

+	tilecoll FLOOR, WALL, FLOOR, WALL ; 6a

+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b

+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c

+	tilecoll WALL, FLOOR, WALL, WALL ; 6d

+	tilecoll FLOOR, WALL, WALL, WALL ; 6e

+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f

+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70

+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71

+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72

+	tilecoll FLOOR, FLOOR, WALL, WALL ; 73

+	tilecoll FLOOR, FLOOR, DOOR, WALL ; 74

+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75

+	tilecoll WALL, WALL, FLOOR, FLOOR ; 76

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 77

+	tilecoll WALL, WALL, WALL, WALL ; 78

+	tilecoll WALL, WALL, WALL, WALL ; 79

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7a

+	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7b

+	tilecoll WALL, WALL, WALL, WALL ; 7c

+	tilecoll WALL, WALL, WALL, WALL ; 7d

+	tilecoll WALL, WALL, WALL, WALL ; 7e

+	tilecoll WALL, WALL, WALL, WALL ; 7f

+	tilecoll WALL, WALL, WALL, WALL ; 80

binary files /dev/null b/data/tilesets/unused_dark_cave_metatiles.bin differ

--- a/data/tilesets/unused_whirl_islands_collision.asm

+++ /dev/null

@@ -1,128 +1,0 @@

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

-	tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 04

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05

-	tilecoll WALL, WALL, WALL, WALL ; 06

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08

-	tilecoll WALL, WALL, WALL, WALL ; 09

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a

-	tilecoll WALL, WALL, WALL, WALL ; 0b

-	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0d

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e

-	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0f

-	tilecoll WALL, WALL, WALL, WALL ; 10

-	tilecoll WALL, WALL, WALL, WALL ; 11

-	tilecoll WALL, WALL, WALL, WALL ; 12

-	tilecoll WALL, WALL, WALL, WALL ; 13

-	tilecoll WALL, WALL, WALL, WALL ; 14

-	tilecoll WALL, WALL, WALL, DOOR ; 15

-	tilecoll WALL, WALL, WALL, WALL ; 16

-	tilecoll WALL, WALL, WALL, DOOR ; 17

-	tilecoll WALL, WALL, TOWN_MAP, WALL ; 18

-	tilecoll WALL, WALL, WALL, WALL ; 19

-	tilecoll WALL, WALL, WALL, WALL ; 1a

-	tilecoll WALL, WALL, WALL, DOOR ; 1b

-	tilecoll WALL, WALL, TOWN_MAP, WALL ; 1c

-	tilecoll WALL, WALL, WALL, WALL ; 1d

-	tilecoll WALL, WALL, DOOR, WALL ; 1e

-	tilecoll WALL, WALL, WALL, WALL ; 1f

-	tilecoll WALL, WALL, WALL, WALL ; 20

-	tilecoll WALL, WALL, WALL, WALL ; 21

-	tilecoll WALL, WALL, WALL, WALL ; 22

-	tilecoll WALL, WALL, WALL, WALL ; 23

-	tilecoll WALL, WALL, WALL, WALL ; 24

-	tilecoll WALL, WALL, WALL, WALL ; 25

-	tilecoll WALL, WALL, WALL, WALL ; 26

-	tilecoll WALL, WALL, WALL, WALL ; 27

-	tilecoll WALL, WALL, WALL, WALL ; 28

-	tilecoll WALL, WALL, WALL, DOOR ; 29

-	tilecoll WALL, WALL, WALL, WALL ; 2a

-	tilecoll WALL, WALL, WALL, DOOR ; 2b

-	tilecoll WALL, WALL, WALL, WALL ; 2c

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 2d

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 2e

-	tilecoll WALL, WALL, WALL, DOOR ; 2f

-	tilecoll WALL, WALL, WALL, WALL ; 30

-	tilecoll BUOY, BUOY, BUOY, WATER_21 ; 31

-	tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 32

-	tilecoll BUOY, BUOY, WATER_21, BUOY ; 33

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 34

-	tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 35

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 36

-	tilecoll WATER_21, BUOY, WATER_21, BUOY ; 37

-	tilecoll WALL, WALL, WALL, WALL ; 38

-	tilecoll BUOY, WATER_21, BUOY, BUOY ; 39

-	tilecoll WATER_21, WATER_21, BUOY, BUOY ; 3a

-	tilecoll WATER_21, BUOY, BUOY, BUOY ; 3b

-	tilecoll WALL, WALL, WALL, WALL ; 3c

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3f

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40

-	tilecoll WALL, WALL, WALL, FLOOR ; 41

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 42

-	tilecoll WALL, WALL, FLOOR, WALL ; 43

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 44

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 45

-	tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 46

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 47

-	tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 48

-	tilecoll WALL, FLOOR, WALL, WALL ; 49

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 4a

-	tilecoll FLOOR, WALL, WALL, WALL ; 4b

-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c

-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d

-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e

-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f

-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50

-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51

-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52

-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53

-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 55

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 56

-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57

-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 59

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 5a

-	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b

-	tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5c

-	tilecoll WALL, WALL, WALL, FLOOR ; 5d

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 5e

-	tilecoll WALL, WALL, FLOOR, WALL ; 5f

-	tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 60

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 61

-	tilecoll WALL, WALL, WALL, WALL ; 62

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 63

-	tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 64

-	tilecoll WALL, FLOOR, WALL, WALL ; 65

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 66

-	tilecoll FLOOR, WALL, WALL, WALL ; 67

-	tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 68

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 69

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 6a

-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b

-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c

-	tilecoll WALL, FLOOR, WALL, WALL ; 6d

-	tilecoll FLOOR, WALL, WALL, WALL ; 6e

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70

-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 73

-	tilecoll FLOOR, FLOOR, DOOR, WALL ; 74

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 76

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 77

-	tilecoll WALL, WALL, WALL, WALL ; 78

-	tilecoll WALL, WALL, WALL, WALL ; 79

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7a

-	tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7b

-	tilecoll WALL, WALL, WALL, WALL ; 7c

-	tilecoll WALL, WALL, WALL, WALL ; 7d

-	tilecoll WALL, WALL, WALL, WALL ; 7e

-	tilecoll WALL, WALL, WALL, WALL ; 7f

-	tilecoll WALL, WALL, WALL, WALL ; 80

binary files a/data/tilesets/unused_whirl_islands_metatiles.bin /dev/null differ

--- a/data/tilesets/whirl_islands_collision.asm

+++ /dev/null

@@ -1,64 +1,0 @@

-	tilecoll WALL, WALL, WALL, WALL ; 01

-	tilecoll WALL, WALL, WALL, WALL ; 02

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

-	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04

-	tilecoll WALL, UP_WALL, WALL, FLOOR ; 05

-	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06

-	tilecoll UP_WALL, WALL, FLOOR, WALL ; 07

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 09

-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c

-	tilecoll WALL, FLOOR, WALL, WALL ; 0d

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e

-	tilecoll FLOOR, WALL, WALL, WALL ; 0f

-	tilecoll WATER, WATER, WATER, WATER ; 10

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13

-	tilecoll FLOOR, FLOOR, WALL, CAVE ; 14

-	tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15

-	tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16

-	tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18

-	tilecoll WALL, WALL, WALL, FLOOR ; 19

-	tilecoll WALL, WALL, FLOOR, FLOOR ; 1a

-	tilecoll WALL, WALL, FLOOR, WALL ; 1b

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c

-	tilecoll WALL, FLOOR, WALL, FLOOR ; 1d

-	tilecoll WALL, WALL, WALL, WALL ; 1e

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 1f

-	tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20

-	tilecoll WALL, FLOOR, WALL, WALL ; 21

-	tilecoll FLOOR, FLOOR, WALL, WALL ; 22

-	tilecoll FLOOR, WALL, WALL, WALL ; 23

-	tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24

-	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25

-	tilecoll WATER, WATER, WATER, WATER ; 26

-	tilecoll WATER, WATER, WATER, WATER ; 27

-	tilecoll WATER, WATER, WATER, WATER ; 28

-	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29

-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a

-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c

-	tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d

-	tilecoll WALL, WALL, WALL, WALL ; 2e

-	tilecoll WALL, WALL, WALL, WALL ; 2f

-	tilecoll WALL, WALL, WALL, WALL ; 30

-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31

-	tilecoll WALL, WALL, WALL, WALL ; 32

-	tilecoll WATER, WATER, WATER, WATER ; 33

-	tilecoll WATER, WATER, WATER, WATER ; 34

-	tilecoll WALL, WALL, WALL, WALL ; 35

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 36

-	tilecoll FLOOR, WALL, FLOOR, WALL ; 37

-	tilecoll WALL, WALL, WALL, CAVE ; 38

-	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39

-	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a

-	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b

-	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c

-	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d

-	tilecoll WATER, WATER, WATER, WATER ; 3e

-	tilecoll WATER, WATER, WATER, WATER ; 3f

-	tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40

--- a/data/tilesets/whirl_islands_metatiles.bin

+++ /dev/null

@@ -1,6 +1,0 @@

-$$$$$$$$*+:;"#23%&&%&&&&&&&&&&&&&'&&&'

-&

-&&&67&&67&&&&$$$$*+:;$$$$"#23







()89







 !01







$$&&&&



@@@@@@@@@@@@@@@@%&&&%&&&%&&&%&&&&&&&&&&&&&&&&&&&&&&'&&&'&&&'&&&'67&&67&&$$%&&'%'

&&&&&&&&

-&

-67'67&'&&&&&&&&&&&&%&&&&&&&&&&'&&&

-&&&

\ No newline at end of file

--- a/docs/map_scripts.md

+++ b/docs/map_scripts.md

@@ -118,7 +118,7 @@

 ### <code>.ObjectEvents: db <i>N</i></code>

 <pre>

-	object_event <i>x</i>, <i>y</i>, <i>sprite</i>, <i>movement</i>, <i>rx</i>, <i>ry</i>, <i>h1</i>, <i>h2</i>, <i>palette</i>, <i>type</i>, <i>range</i>, <i>script</i>, <i>event_flag<i>

+	object_event <i>x</i>, <i>y</i>, <i>sprite</i>, <i>movement</i>, <i>rx</i>, <i>ry</i>, <i>h1</i>, <i>h2</i>, <i>palette</i>, <i>type</i>, <i>range</i>, <i>script</i>, <i>event_flag</i>

 </pre>

 Movement types:

--- a/engine/tileset_anims.asm

+++ b/engine/tileset_anims.asm

@@ -35,7 +35,7 @@

 ; fc01b

 Tileset0Anim: ; 0xfc01b

-TilesetJohto2Anim: ; 0xfc01b

+TilesetJohtoModernAnim: ; 0xfc01b

 TilesetKantoAnim: ; 0xfc01b

 	dw vTiles2 tile $14, AnimateWaterTile

 	dw NULL,  WaitTileAnimation

@@ -64,7 +64,7 @@

 	dw NULL,  DoneTileAnimation

 ; 0xfc073

-TilesetIlexForestAnim: ; 0xfc073

+TilesetForestAnim: ; 0xfc073

 	dw NULL,  ForestTreeLeftAnimation

 	dw NULL,  ForestTreeRightAnimation

 	dw NULL,  WaitTileAnimation

@@ -79,7 +79,7 @@

 	dw NULL,  DoneTileAnimation

 ; 0xfc0a3

-TilesetJohto1Anim: ; 0xfc0a3

+TilesetJohtoAnim: ; 0xfc0a3

 	dw vTiles2 tile $14, AnimateWaterTile

 	dw NULL,  WaitTileAnimation

 	dw NULL,  WaitTileAnimation

@@ -138,7 +138,7 @@

 	dw NULL,  DoneTileAnimation

 ; 0xfc15f

-TilesetGym1Anim: ; 0xfc15f

+TilesetEliteFourRoomAnim: ; 0xfc15f

 	dw NULL,  LavaBubbleAnim2

 	dw NULL,  WaitTileAnimation

 	dw NULL,  WaitTileAnimation

@@ -182,7 +182,7 @@

 ; 0xfc1e7

 TilesetCaveAnim: ; 0xfc1e7

-TilesetWhirlIslandsAnim: ; 0xfc1e7

+TilesetDarkCaveAnim: ; 0xfc1e7

 	dw vTiles2 tile $14, WriteTileToBuffer

 	dw NULL,  FlickeringCaveEntrancePalette

 	dw wTileAnimBuffer, ScrollTileRightLeft

@@ -226,17 +226,17 @@

 	dw NULL,  DoneTileAnimation

 ; 0xfc27f

-TilesetSproutTowerAnim: ; 0xfc27f

-	dw SproutPillarTilePointer9,  AnimateSproutPillarTile

-	dw SproutPillarTilePointer10, AnimateSproutPillarTile

-	dw SproutPillarTilePointer7,  AnimateSproutPillarTile

-	dw SproutPillarTilePointer8,  AnimateSproutPillarTile

-	dw SproutPillarTilePointer5,  AnimateSproutPillarTile

-	dw SproutPillarTilePointer6,  AnimateSproutPillarTile

-	dw SproutPillarTilePointer3,  AnimateSproutPillarTile

-	dw SproutPillarTilePointer4,  AnimateSproutPillarTile

-	dw SproutPillarTilePointer1,  AnimateSproutPillarTile

-	dw SproutPillarTilePointer2,  AnimateSproutPillarTile

+TilesetTowerAnim: ; 0xfc27f

+	dw TowerPillarTilePointer9,  AnimateTowerPillarTile

+	dw TowerPillarTilePointer10, AnimateTowerPillarTile

+	dw TowerPillarTilePointer7,  AnimateTowerPillarTile

+	dw TowerPillarTilePointer8,  AnimateTowerPillarTile

+	dw TowerPillarTilePointer5,  AnimateTowerPillarTile

+	dw TowerPillarTilePointer6,  AnimateTowerPillarTile

+	dw TowerPillarTilePointer3,  AnimateTowerPillarTile

+	dw TowerPillarTilePointer4,  AnimateTowerPillarTile

+	dw TowerPillarTilePointer1,  AnimateTowerPillarTile

+	dw TowerPillarTilePointer2,  AnimateTowerPillarTile

 	dw NULL,  StandingTileFrame

 	dw NULL,  WaitTileAnimation

 	dw NULL,  WaitTileAnimation

@@ -259,20 +259,20 @@

 ; 0xfc2e7

 TilesetBattleTowerOutsideAnim: ; 0xfc2e7

-TilesetHouse1Anim: ; 0xfc2e7

+TilesetHouseAnim: ; 0xfc2e7

 TilesetPlayersHouseAnim: ; 0xfc2e7

 TilesetPokecenterAnim: ; 0xfc2e7

 TilesetGateAnim: ; 0xfc2e7

 TilesetLabAnim: ; 0xfc2e7

-TilesetPowerPlantAnim: ; 0xfc2e7

+TilesetFacilityAnim: ; 0xfc2e7

 TilesetMartAnim: ; 0xfc2e7

-TilesetCeladonMansionAnim: ; 0xfc2e7

+TilesetMansionAnim: ; 0xfc2e7

 TilesetGameCornerAnim: ; 0xfc2e7

-TilesetKurtsHouseAnim: ; 0xfc2e7

+TilesetTraditionalHouseAnim: ; 0xfc2e7

 TilesetTrainStationAnim: ; 0xfc2e7

-TilesetOlivineGymAnim: ; 0xfc2e7

+TilesetChampionsRoomAnim: ; 0xfc2e7

 TilesetLighthouseAnim: ; 0xfc2e7

-TilesetPlayersHouse2FAnim: ; 0xfc2e7

+TilesetPlayersRoomAnim: ; 0xfc2e7

 TilesetPokeComCenterAnim: ; 0xfc2e7

 TilesetBattleTowerAnim: ; 0xfc2e7

 TilesetRuinsOfAlphAnim: ; 0xfc2e7

@@ -754,7 +754,7 @@

 ; fc645

-AnimateSproutPillarTile: ; fc645

+AnimateTowerPillarTile: ; fc645

 ; Read from struct at de:

 ; 	Destination (VRAM)

 ;	Address of the first tile in the frame array

@@ -1023,27 +1023,27 @@

 ; fc750

-SproutPillarTilePointer1:  dw vTiles2 tile $2d, SproutPillarTile1

-SproutPillarTilePointer2:  dw vTiles2 tile $2f, SproutPillarTile2

-SproutPillarTilePointer3:  dw vTiles2 tile $3d, SproutPillarTile3

-SproutPillarTilePointer4:  dw vTiles2 tile $3f, SproutPillarTile4

-SproutPillarTilePointer5:  dw vTiles2 tile $3c, SproutPillarTile5

-SproutPillarTilePointer6:  dw vTiles2 tile $2c, SproutPillarTile6

-SproutPillarTilePointer7:  dw vTiles2 tile $4d, SproutPillarTile7

-SproutPillarTilePointer8:  dw vTiles2 tile $4f, SproutPillarTile8

-SproutPillarTilePointer9:  dw vTiles2 tile $5d, SproutPillarTile9

-SproutPillarTilePointer10: dw vTiles2 tile $5f, SproutPillarTile10

+TowerPillarTilePointer1:  dw vTiles2 tile $2d, TowerPillarTile1

+TowerPillarTilePointer2:  dw vTiles2 tile $2f, TowerPillarTile2

+TowerPillarTilePointer3:  dw vTiles2 tile $3d, TowerPillarTile3

+TowerPillarTilePointer4:  dw vTiles2 tile $3f, TowerPillarTile4

+TowerPillarTilePointer5:  dw vTiles2 tile $3c, TowerPillarTile5

+TowerPillarTilePointer6:  dw vTiles2 tile $2c, TowerPillarTile6

+TowerPillarTilePointer7:  dw vTiles2 tile $4d, TowerPillarTile7

+TowerPillarTilePointer8:  dw vTiles2 tile $4f, TowerPillarTile8

+TowerPillarTilePointer9:  dw vTiles2 tile $5d, TowerPillarTile9

+TowerPillarTilePointer10: dw vTiles2 tile $5f, TowerPillarTile10

-SproutPillarTile1:  INCBIN "gfx/tilesets/sprout-pillar/1.2bpp"

-SproutPillarTile2:  INCBIN "gfx/tilesets/sprout-pillar/2.2bpp"

-SproutPillarTile3:  INCBIN "gfx/tilesets/sprout-pillar/3.2bpp"

-SproutPillarTile4:  INCBIN "gfx/tilesets/sprout-pillar/4.2bpp"

-SproutPillarTile5:  INCBIN "gfx/tilesets/sprout-pillar/5.2bpp"

-SproutPillarTile6:  INCBIN "gfx/tilesets/sprout-pillar/6.2bpp"

-SproutPillarTile7:  INCBIN "gfx/tilesets/sprout-pillar/7.2bpp"

-SproutPillarTile8:  INCBIN "gfx/tilesets/sprout-pillar/8.2bpp"

-SproutPillarTile9:  INCBIN "gfx/tilesets/sprout-pillar/9.2bpp"

-SproutPillarTile10: INCBIN "gfx/tilesets/sprout-pillar/10.2bpp"

+TowerPillarTile1:  INCBIN "gfx/tilesets/tower-pillar/1.2bpp"

+TowerPillarTile2:  INCBIN "gfx/tilesets/tower-pillar/2.2bpp"

+TowerPillarTile3:  INCBIN "gfx/tilesets/tower-pillar/3.2bpp"

+TowerPillarTile4:  INCBIN "gfx/tilesets/tower-pillar/4.2bpp"

+TowerPillarTile5:  INCBIN "gfx/tilesets/tower-pillar/5.2bpp"

+TowerPillarTile6:  INCBIN "gfx/tilesets/tower-pillar/6.2bpp"

+TowerPillarTile7:  INCBIN "gfx/tilesets/tower-pillar/7.2bpp"

+TowerPillarTile8:  INCBIN "gfx/tilesets/tower-pillar/8.2bpp"

+TowerPillarTile9:  INCBIN "gfx/tilesets/tower-pillar/9.2bpp"

+TowerPillarTile10: INCBIN "gfx/tilesets/tower-pillar/10.2bpp"

 ; fca98

--- a/engine/tileset_palettes.asm

+++ b/engine/tileset_palettes.asm

@@ -6,11 +6,11 @@

 	jr z, .battle_tower

 	cp TILESET_ICE_PATH

 	jr z, .ice_path

-	cp TILESET_HOUSE_1

+	cp TILESET_HOUSE

 	jr z, .house

 	cp TILESET_RADIO_TOWER

 	jr z, .radio_tower

-	cp TILESET_CELADON_MANSION

+	cp TILESET_MANSION

 	jr z, .mansion_mobile

 	jr .do_nothing

@@ -102,7 +102,7 @@

 ; 495ee

 HousePalette: ; 495ee

-INCLUDE "gfx/tilesets/house_1.pal"

+INCLUDE "gfx/tilesets/house.pal"

 ; 4962e

 LoadRadioTowerPalette: ; 4962e

@@ -119,7 +119,7 @@

 ; 4967d

 MansionPalette1: ; 4967d

-INCLUDE "gfx/tilesets/celadon_mansion_1.pal"

+INCLUDE "gfx/tilesets/mansion_1.pal"

 ; 496c5

 LoadMansionPalette: ; 496c5

@@ -147,5 +147,5 @@

 ; 496fe

 MansionPalette2: ; 496fe

-INCLUDE "gfx/tilesets/celadon_mansion_2.pal"

+INCLUDE "gfx/tilesets/mansion_2.pal"

 ; 49706

--- a/gfx/tilesets.asm

+++ b/gfx/tilesets.asm

@@ -19,18 +19,18 @@

 ; 0x19006

 Tileset0GFX: ; 0x19006

-TilesetJohto1GFX: ; 0x19006

-INCBIN "gfx/tilesets/johto_1.2bpp.lz"

+TilesetJohtoGFX: ; 0x19006

+INCBIN "gfx/tilesets/johto.2bpp.lz"

 ; 0x19c0e

 Tileset0Meta: ; 0x19c0e

-TilesetJohto1Meta: ; 0x19c0e

-INCBIN "data/tilesets/johto_1_metatiles.bin"

+TilesetJohtoMeta: ; 0x19c0e

+INCBIN "data/tilesets/johto_metatiles.bin"

 ; 0x1a40e

 Tileset0Coll: ; 0x1a40e

-TilesetJohto1Coll: ; 0x1a40e

-INCLUDE "data/tilesets/johto_1_collision.asm"

+TilesetJohtoColl: ; 0x1a40e

+INCLUDE "data/tilesets/johto_collision.asm"

 ; 0x1a60e

 TilesetIcePathGFX: ; 0x1a60e

@@ -45,16 +45,16 @@

 INCLUDE "data/tilesets/ice_path_collision.asm"

 ; 0x1b43e

-TilesetPlayersHouse2FGFX: ; 0x1b43e

-INCBIN "gfx/tilesets/players_house_2f.2bpp.lz"

+TilesetPlayersRoomGFX: ; 0x1b43e

+INCBIN "gfx/tilesets/players_room.2bpp.lz"

 ; 0x1b8fe

-TilesetPlayersHouse2FMeta: ; 0x1b8fe

-INCBIN "data/tilesets/players_house_2f_metatiles.bin"

+TilesetPlayersRoomMeta: ; 0x1b8fe

+INCBIN "data/tilesets/players_room_metatiles.bin"

 ; 0x1bcfe

-TilesetPlayersHouse2FColl: ; 0x1bcfe

-INCLUDE "data/tilesets/players_house_2f_collision.asm"

+TilesetPlayersRoomColl: ; 0x1bcfe

+INCLUDE "data/tilesets/players_room_collision.asm"

 ; 0x1bdfe

@@ -96,16 +96,16 @@

 INCLUDE "data/tilesets/players_house_collision.asm"

 ; 0x1de2c

-TilesetCeladonMansionGFX: ; 0x1de2c

-INCBIN "gfx/tilesets/celadon_mansion.2bpp.lz"

+TilesetMansionGFX: ; 0x1de2c

+INCBIN "gfx/tilesets/mansion.2bpp.lz"

 ; 0x1e58c

-TilesetCeladonMansionMeta: ; 0x1e58c

-INCBIN "data/tilesets/celadon_mansion_metatiles.bin"

+TilesetMansionMeta: ; 0x1e58c

+INCBIN "data/tilesets/mansion_metatiles.bin"

 ; 0x1e98c

-TilesetCeladonMansionColl: ; 0x1e98c

-INCLUDE "data/tilesets/celadon_mansion_collision.asm"

+TilesetMansionColl: ; 0x1e98c

+INCLUDE "data/tilesets/mansion_collision.asm"

 ; 0x1ea8c

 TilesetCaveGFX: ; 0x1ea8c

@@ -113,12 +113,12 @@

 ; 0x1ee1c

 TilesetCaveMeta: ; 0x1ee1c

-TilesetWhirlIslandsMeta: ; 0x1ee1c

+TilesetDarkCaveMeta: ; 0x1ee1c

 INCBIN "data/tilesets/cave_metatiles.bin"

 ; 0x1f21c

 TilesetCaveColl: ; 0x1f21c

-TilesetWhirlIslandsColl: ; 0x1f21c

+TilesetDarkCaveColl: ; 0x1f21c

 INCLUDE "data/tilesets/cave_collision.asm"

 ; 0x1f31c

@@ -125,16 +125,16 @@

 SECTION "Tileset Data 3", ROMX

-TilesetSproutTowerGFX: ; 0x20181

-INCBIN "gfx/tilesets/sprout_tower.2bpp.lz"

+TilesetTowerGFX: ; 0x20181

+INCBIN "gfx/tilesets/tower.2bpp.lz"

 ; 0x206e1

-TilesetSproutTowerMeta: ; 0x206e1

-INCBIN "data/tilesets/sprout_tower_metatiles.bin"

+TilesetTowerMeta: ; 0x206e1

+INCBIN "data/tilesets/tower_metatiles.bin"

 ; 0x20ae1

-TilesetSproutTowerColl: ; 0x20ae1

-INCLUDE "data/tilesets/sprout_tower_collision.asm"

+TilesetTowerColl: ; 0x20ae1

+INCLUDE "data/tilesets/tower_collision.asm"

 ; 0x20be1

 TilesetLabGFX: ; 0x20be1

@@ -185,23 +185,23 @@

 INCLUDE "data/tilesets/train_station_collision.asm"

 ; 0x23891

-TilesetIlexForestMeta: ; 0x23891

-INCBIN "data/tilesets/ilex_forest_metatiles.bin"

+TilesetForestMeta: ; 0x23891

+INCBIN "data/tilesets/forest_metatiles.bin"

 ; 0x23b11

 SECTION "Tileset Data 4", ROMX

-TilesetGym1GFX: ; 0x30000

-INCBIN "gfx/tilesets/gym_1.2bpp.lz"

+TilesetEliteFourRoomGFX: ; 0x30000

+INCBIN "gfx/tilesets/elite_four_room.2bpp.lz"

 ; 0x304e0

-TilesetGym1Meta: ; 0x304e0

-INCBIN "data/tilesets/gym_1_metatiles.bin"

+TilesetEliteFourRoomMeta: ; 0x304e0

+INCBIN "data/tilesets/elite_four_room_metatiles.bin"

 ; 0x308e0

-TilesetGym1Coll: ; 0x308e0

-INCLUDE "data/tilesets/gym_1_collision.asm"

+TilesetEliteFourRoomColl: ; 0x308e0

+INCLUDE "data/tilesets/elite_four_room_collision.asm"

 ; 0x309e0

 TilesetParkGFX: ; 0x309e0

@@ -240,16 +240,16 @@

 INCLUDE "data/tilesets/underground_collision.asm"

 ; 0x326b0

-TilesetWhirlIslandsGFX: ; 0x326b0

-INCBIN "gfx/tilesets/whirl_islands.2bpp.lz"

+TilesetDarkCaveGFX: ; 0x326b0

+INCBIN "gfx/tilesets/dark_cave.2bpp.lz"

 ; 0x329f0

-UnusedTilesetWhirlIslandsMeta: ; 0x329f0

-INCBIN "data/tilesets/unused_whirl_islands_metatiles.bin"

+UnusedTilesetDarkCaveMeta: ; 0x329f0

+INCBIN "data/tilesets/unused_dark_cave_metatiles.bin"

 ; 0x331f0

-UnusedTilesetWhirlIslandsColl: ; 0x331f0

-INCLUDE "data/tilesets/unused_whirl_islands_collision.asm"

+UnusedTilesetDarkCaveColl: ; 0x331f0

+INCLUDE "data/tilesets/unused_dark_cave_collision.asm"

 ; 0x333f0

@@ -291,60 +291,60 @@

 INCLUDE "data/tilesets/gate_collision.asm"

 ; 0xb5ee0

-TilesetJohto2GFX: ; 0xb5ee0

+TilesetJohtoModernGFX: ; 0xb5ee0

 TilesetBattleTowerOutsideGFX: ; 0xb5ee0

-INCBIN "gfx/tilesets/johto_2.2bpp.lz"

+INCBIN "gfx/tilesets/johto_modern.2bpp.lz"

 ; 0xb6ae8

-TilesetJohto2Meta: ; 0xb6ae8

-INCBIN "data/tilesets/johto_2_metatiles.bin"

+TilesetJohtoModernMeta: ; 0xb6ae8

+INCBIN "data/tilesets/johto_modern_metatiles.bin"

 ; 0xb72e8

-TilesetJohto2Coll: ; 0xb72e8

-INCLUDE "data/tilesets/johto_2_collision.asm"

+TilesetJohtoModernColl: ; 0xb72e8

+INCLUDE "data/tilesets/johto_modern_collision.asm"

 ; 0xb74e8

-TilesetKurtsHouseGFX: ; 0xb74e8

-INCBIN "gfx/tilesets/kurts_house.2bpp.lz"

+TilesetTraditionalHouseGFX: ; 0xb74e8

+INCBIN "gfx/tilesets/traditional_house.2bpp.lz"

 ; 0xb79a8

-TilesetKurtsHouseMeta: ; 0xb79a8

-INCBIN "data/tilesets/kurts_house_metatiles.bin"

+TilesetTraditionalHouseMeta: ; 0xb79a8

+INCBIN "data/tilesets/traditional_house_metatiles.bin"

 ; 0xb7da8

-TilesetKurtsHouseColl: ; 0xb7da8

-INCLUDE "data/tilesets/kurts_house_collision.asm"

+TilesetTraditionalHouseColl: ; 0xb7da8

+INCLUDE "data/tilesets/traditional_house_collision.asm"

 ; 0xb7ea8

 SECTION "Tileset Data 6", ROMX

-TilesetIlexForestGFX: ; 0xdc000

-INCBIN "gfx/tilesets/ilex_forest.2bpp.lz"

+TilesetForestGFX: ; 0xdc000

+INCBIN "gfx/tilesets/forest.2bpp.lz"

 ; 0xdc3d0

-TilesetOlivineGymGFX: ; 0xdc3d0

-INCBIN "gfx/tilesets/olivine_gym.2bpp.lz"

+TilesetChampionsRoomGFX: ; 0xdc3d0

+INCBIN "gfx/tilesets/champions_room.2bpp.lz"

 ; 0xdcc50

-TilesetOlivineGymMeta: ; 0xdcc50

-INCBIN "data/tilesets/olivine_gym_metatiles.bin"

+TilesetChampionsRoomMeta: ; 0xdcc50

+INCBIN "data/tilesets/champions_room_metatiles.bin"

 ; 0xdd050

-TilesetOlivineGymColl: ; 0xdd050

-INCLUDE "data/tilesets/olivine_gym_collision.asm"

+TilesetChampionsRoomColl: ; 0xdd050

+INCLUDE "data/tilesets/champions_room_collision.asm"

 ; 0xdd150

-TilesetHouse1GFX: ; 0xdd150

-INCBIN "gfx/tilesets/house_1.2bpp.lz"

+TilesetHouseGFX: ; 0xdd150

+INCBIN "gfx/tilesets/house.2bpp.lz"

 ; 0xdd600

-TilesetHouse1Meta: ; 0xdd600

-INCBIN "data/tilesets/house_1_metatiles.bin"

+TilesetHouseMeta: ; 0xdd600

+INCBIN "data/tilesets/house_metatiles.bin"

 ; 0xdda00

-TilesetHouse1Coll: ; 0xdda00

-INCLUDE "data/tilesets/house_1_collision.asm"

+TilesetHouseColl: ; 0xdda00

+INCLUDE "data/tilesets/house_collision.asm"

 ; 0xddb00

 TilesetLighthouseGFX: ; 0xddb00

@@ -359,20 +359,20 @@

 INCLUDE "data/tilesets/lighthouse_collision.asm"

 ; 0xde470

-TilesetIlexForestColl: ; 0xde470

-INCLUDE "data/tilesets/ilex_forest_collision.asm"

+TilesetForestColl: ; 0xde470

+INCLUDE "data/tilesets/forest_collision.asm"

 ; 0xde570

-TilesetPowerPlantGFX: ; 0xde570

-INCBIN "gfx/tilesets/power_plant.2bpp.lz"

+TilesetFacilityGFX: ; 0xde570

+INCBIN "gfx/tilesets/facility.2bpp.lz"

 ; 0xde990

-TilesetPowerPlantMeta: ; 0xde990

-INCBIN "data/tilesets/power_plant_metatiles.bin"

+TilesetFacilityMeta: ; 0xde990

+INCBIN "data/tilesets/facility_metatiles.bin"

 ; 0xded90

-TilesetPowerPlantColl: ; 0xded90

-INCLUDE "data/tilesets/power_plant_collision.asm"

+TilesetFacilityColl: ; 0xded90

+INCLUDE "data/tilesets/facility_collision.asm"

 ; 0xdee90

 TilesetBattleTowerOutsideMeta: ; 0xdee90

binary files a/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 /dev/null differ

binary files a/gfx/tilesets/celadon_mansion.png /dev/null differ

--- a/gfx/tilesets/celadon_mansion_1.pal

+++ /dev/null

@@ -1,44 +1,0 @@

-	RGB 30, 28, 26

-	RGB 19, 19, 19

-	RGB 13, 13, 13

-	RGB 07, 07, 07

-	RGB 30, 28, 26

-	RGB 31, 19, 24

-	RGB 30, 10, 06

-	RGB 07, 07, 07

-	RGB 18, 24, 09

-	RGB 15, 20, 01

-	RGB 09, 13, 00

-	RGB 07, 07, 07

-	RGB 30, 28, 26

-	RGB 15, 16, 31

-	RGB 09, 09, 31

-	RGB 07, 07, 07

-	RGB 30, 28, 26

-	RGB 31, 31, 07

-	RGB 31, 16, 01

-	RGB 07, 07, 07

-	RGB 26, 24, 17

-	RGB 21, 17, 07

-	RGB 16, 13, 03

-	RGB 07, 07, 07

-	RGB 30, 28, 26

-	RGB 17, 19, 31

-	RGB 14, 16, 31

-	RGB 07, 07, 07

-	RGB 31, 31, 16

-	RGB 31, 31, 16

-	RGB 14, 09, 00

-	RGB 00, 00, 00

-	RGB 05, 05, 16

-	RGB 08, 19, 28

-	RGB 00, 00, 00

-	RGB 31, 31, 31

--- a/gfx/tilesets/celadon_mansion_2.pal

+++ /dev/null

@@ -1,4 +1,0 @@

-	RGB 25, 24, 23

-	RGB 20, 19, 19

-	RGB 14, 16, 31

-	RGB 07, 07, 07

--- a/gfx/tilesets/celadon_mansion_palette_map.asm

+++ /dev/null

@@ -1,29 +1,0 @@

-	tilepal 0, GRAY, BROWN, WATER, WATER, RED, WATER, GRAY, GRAY

-	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER

-	tilepal 0, GRAY, RED, WATER, WATER, WATER, WATER, GRAY, GRAY

-	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER

-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

-	tilepal 0, RED, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, BROWN, BROWN

-	tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, WATER, BROWN, BROWN

-	tilepal 0, BROWN, GREEN, BROWN, BROWN, WATER, WATER, BROWN, BROWN

-rept 16

-	db $ff

-endr

-	tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW

-	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, RED, RED, WATER, WATER

-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW

-	tilepal 1, WATER, YELLOW, YELLOW, YELLOW, GREEN, GREEN, WATER, WATER

-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

-	tilepal 1, RED, RED, GRAY, YELLOW, RED, RED, YELLOW, WATER

-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

-	tilepal 1, YELLOW, YELLOW, GRAY, YELLOW, RED, RED, YELLOW, WATER

-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GREEN

-	tilepal 1, YELLOW, YELLOW, WATER, YELLOW, WATER, WATER, YELLOW, YELLOW

-	tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN

-	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW

binary files /dev/null b/gfx/tilesets/champions_room.2bpp.lz.93800351 differ

binary files /dev/null b/gfx/tilesets/champions_room.png differ

--- /dev/null

+++ b/gfx/tilesets/champions_room_palette_map.asm

@@ -1,0 +1,29 @@

+	tilepal 0, GRAY, GREEN, GREEN, GREEN, RED, GRAY, GRAY, GRAY

+	tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY

+	tilepal 0, GRAY, GRAY, GREEN, GREEN, RED, GRAY, GRAY, GRAY

+	tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY

+	tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

+	tilepal 0, GRAY, GRAY, GRAY, GREEN, GREEN, YELLOW, RED, RED

+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

+	tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, RED, RED

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN

+	tilepal 0, GRAY, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY

+rept 16

+	db $ff

+endr

+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER

+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

+	tilepal 1, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY

+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

+	tilepal 1, GRAY, RED, ROOF, RED, RED, RED, RED, RED

+	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED

+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER

+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER

+	tilepal 1, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, WATER, WATER, WATER, WATER, WATER, WATER, WATER

+	tilepal 1, WATER, RED, GRAY, GRAY, RED, WATER, WATER, WATER

+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, GRAY

binary files /dev/null b/gfx/tilesets/dark_cave.2bpp.lz.25b9c4b6 differ

binary files /dev/null b/gfx/tilesets/dark_cave.png differ

--- /dev/null

+++ b/gfx/tilesets/dark_cave_palette_map.asm

@@ -1,0 +1,29 @@

+	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN

+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN

+	tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY

+	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

+rept 16

+	db $ff

+endr

+	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN

+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN

+	tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY

+	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

binary files /dev/null b/gfx/tilesets/elite_four_room.2bpp.lz.c1f2ed8f differ

binary files /dev/null b/gfx/tilesets/elite_four_room.png differ

--- /dev/null

+++ b/gfx/tilesets/elite_four_room_palette_map.asm

@@ -1,0 +1,29 @@

+	tilepal 0, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN

+	tilepal 0, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN

+	tilepal 0, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN

+	tilepal 0, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN

+	tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY

+	tilepal 0, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN

+	tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY

+	tilepal 0, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED

+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN

+	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF

+	tilepal 0, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY

+	tilepal 0, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF

+rept 16

+	db $ff

+endr

+	tilepal 1, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN

+	tilepal 1, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN

+	tilepal 1, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN

+	tilepal 1, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN

+	tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY

+	tilepal 1, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN

+	tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY

+	tilepal 1, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED

+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN

+	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF

+	tilepal 1, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY

+	tilepal 1, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF

binary files /dev/null b/gfx/tilesets/facility.2bpp.lz.454cfd8b differ

binary files /dev/null b/gfx/tilesets/facility.png differ

--- /dev/null

+++ b/gfx/tilesets/facility_palette_map.asm

@@ -1,0 +1,29 @@

+	tilepal 0, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN

+	tilepal 0, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

+	tilepal 0, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN

+	tilepal 0, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN

+	tilepal 0, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED

+	tilepal 0, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER

+	tilepal 0, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF

+	tilepal 0, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY

+rept 16

+	db $ff

+endr

+	tilepal 1, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN

+	tilepal 1, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

+	tilepal 1, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN

+	tilepal 1, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN

+	tilepal 1, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED

+	tilepal 1, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER

+	tilepal 1, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF

+	tilepal 1, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY

binary files /dev/null b/gfx/tilesets/forest.2bpp.lz.6b0ac896 differ

binary files /dev/null b/gfx/tilesets/forest.png differ

--- /dev/null

+++ b/gfx/tilesets/forest_palette_map.asm

@@ -1,0 +1,29 @@

+	tilepal 0, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW

+	tilepal 0, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN

+	tilepal 0, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

+	tilepal 0, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

+	tilepal 0, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+rept 16

+	db $ff

+endr

+	tilepal 1, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW

+	tilepal 1, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN

+	tilepal 1, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

+	tilepal 1, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

+	tilepal 1, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

binary files a/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f /dev/null differ

binary files a/gfx/tilesets/gym_1.png /dev/null differ

--- a/gfx/tilesets/gym_1_palette_map.asm

+++ /dev/null

@@ -1,29 +1,0 @@

-	tilepal 0, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN

-	tilepal 0, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN

-	tilepal 0, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN

-	tilepal 0, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN

-	tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY

-	tilepal 0, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN

-	tilepal 0, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY

-	tilepal 0, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED

-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN

-	tilepal 0, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF

-	tilepal 0, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY

-	tilepal 0, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF

-rept 16

-	db $ff

-endr

-	tilepal 1, GRAY, ROOF, RED, RED, RED, ROOF, ROOF, GREEN

-	tilepal 1, GREEN, GRAY, GREEN, GREEN, GREEN, GREEN, WATER, GREEN

-	tilepal 1, GRAY, WATER, WATER, WATER, RED, ROOF, ROOF, BROWN

-	tilepal 1, BROWN, RED, GRAY, GREEN, GREEN, GREEN, GREEN, GREEN

-	tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY

-	tilepal 1, GRAY, RED, GRAY, GRAY, GRAY, ROOF, GREEN, BROWN

-	tilepal 1, RED, RED, GRAY, GRAY, WATER, GRAY, GRAY, GRAY

-	tilepal 1, RED, WATER, GRAY, GRAY, GRAY, GRAY, RED, RED

-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN

-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, ROOF, ROOF

-	tilepal 1, WATER, GREEN, GREEN, BROWN, GRAY, GRAY, GRAY, GRAY

-	tilepal 1, GRAY, GRAY, WATER, RED, WATER, WATER, ROOF, ROOF

binary files /dev/null b/gfx/tilesets/house.2bpp.lz.c848ef13 differ

--- /dev/null

+++ b/gfx/tilesets/house.pal

@@ -1,0 +1,40 @@

+; gray

+	RGB 30, 28, 26

+	RGB 19, 19, 19

+	RGB 13, 13, 13

+	RGB 07, 07, 07

+; red

+	RGB 30, 28, 26

+	RGB 31, 19, 24

+	RGB 30, 10, 06

+	RGB 07, 07, 07

+; green

+	RGB 30, 28, 26

+	RGB 15, 20, 01

+	RGB 09, 13, 00

+	RGB 07, 07, 07

+; water (blue)

+	RGB 30, 28, 26

+	RGB 15, 16, 31

+	RGB 09, 09, 31

+	RGB 07, 07, 07

+; yellow

+	RGB 30, 28, 26

+	RGB 31, 31, 07

+	RGB 31, 16, 01

+	RGB 07, 07, 07

+; brown

+	RGB 26, 24, 17

+	RGB 21, 17, 07

+	RGB 16, 13, 03

+	RGB 07, 07, 07

+; roof (glass)

+	RGB 30, 28, 26

+	RGB 31, 19, 24

+	RGB 16, 13, 03

+	RGB 07, 07, 07

+; text

+	RGB 31, 31, 16

+	RGB 31, 31, 16

+	RGB 14, 09, 00

+	RGB 00, 00, 00

binary files /dev/null b/gfx/tilesets/house.png differ

binary files a/gfx/tilesets/house_1.2bpp.lz.c848ef13 /dev/null differ

--- a/gfx/tilesets/house_1.pal

+++ /dev/null

@@ -1,40 +1,0 @@

-; gray

-	RGB 30, 28, 26

-	RGB 19, 19, 19

-	RGB 13, 13, 13

-	RGB 07, 07, 07

-; red

-	RGB 30, 28, 26

-	RGB 31, 19, 24

-	RGB 30, 10, 06

-	RGB 07, 07, 07

-; green

-	RGB 30, 28, 26

-	RGB 15, 20, 01

-	RGB 09, 13, 00

-	RGB 07, 07, 07

-; water (blue)

-	RGB 30, 28, 26

-	RGB 15, 16, 31

-	RGB 09, 09, 31

-	RGB 07, 07, 07

-; yellow

-	RGB 30, 28, 26

-	RGB 31, 31, 07

-	RGB 31, 16, 01

-	RGB 07, 07, 07

-; brown

-	RGB 26, 24, 17

-	RGB 21, 17, 07

-	RGB 16, 13, 03

-	RGB 07, 07, 07

-; roof (glass)

-	RGB 30, 28, 26

-	RGB 31, 19, 24

-	RGB 16, 13, 03

-	RGB 07, 07, 07

-; text

-	RGB 31, 31, 16

-	RGB 31, 31, 16

-	RGB 14, 09, 00

-	RGB 00, 00, 00

binary files a/gfx/tilesets/house_1.png /dev/null differ

--- a/gfx/tilesets/house_1_palette_map.asm

+++ /dev/null

@@ -1,29 +1,0 @@

-	tilepal 0, WATER, RED, RED, RED, RED, BROWN, WATER, WATER

-	tilepal 0, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER

-	tilepal 0, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY, BROWN, BROWN

-	tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN

-	tilepal 0, WATER, WATER, BROWN, BROWN, WATER, WATER, BROWN, BROWN

-	tilepal 0, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER

-	tilepal 0, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN

-	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

-rept 16

-	db $ff

-endr

-	tilepal 1, WATER, RED, RED, RED, RED, BROWN, WATER, WATER

-	tilepal 1, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN

-	tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN

-	tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN

-	tilepal 1, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER

-	tilepal 1, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN

-	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

--- /dev/null

+++ b/gfx/tilesets/house_palette_map.asm

@@ -1,0 +1,29 @@

+	tilepal 0, WATER, RED, RED, RED, RED, BROWN, WATER, WATER

+	tilepal 0, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER

+	tilepal 0, ROOF, ROOF, ROOF, ROOF, GRAY, GRAY, BROWN, BROWN

+	tilepal 0, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN

+	tilepal 0, WATER, WATER, BROWN, BROWN, WATER, WATER, BROWN, BROWN

+	tilepal 0, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER

+	tilepal 0, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN

+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

+rept 16

+	db $ff

+endr

+	tilepal 1, WATER, RED, RED, RED, RED, BROWN, WATER, WATER

+	tilepal 1, GREEN, GREEN, GREEN, GREEN, WATER, WATER, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, RED, RED, RED, BROWN, WATER, WATER

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN

+	tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, YELLOW, GREEN, WATER, WATER, WATER, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, WATER, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER, BROWN

+	tilepal 1, GRAY, GRAY, BROWN, BROWN, WATER, WATER, BROWN, BROWN

+	tilepal 1, GRAY, GRAY, WATER, GRAY, BROWN, BROWN, BROWN, WATER

+	tilepal 1, RED, RED, BROWN, BROWN, GREEN, YELLOW, BROWN, BROWN

+	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

binary files a/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 /dev/null differ

binary files a/gfx/tilesets/ilex_forest.png /dev/null differ

--- a/gfx/tilesets/ilex_forest_palette_map.asm

+++ /dev/null

@@ -1,29 +1,0 @@

-	tilepal 0, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW

-	tilepal 0, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN

-	tilepal 0, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

-	tilepal 0, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

-	tilepal 0, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-rept 16

-	db $ff

-endr

-	tilepal 1, GRAY, BROWN, BROWN, RED, YELLOW, GREEN, BROWN, YELLOW

-	tilepal 1, YELLOW, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN

-	tilepal 1, BROWN, BROWN, BROWN, RED, WATER, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

-	tilepal 1, GREEN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, GREEN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

-	tilepal 1, GREEN, GREEN, GREEN, BROWN, GREEN, BROWN, BROWN, GREEN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

binary files /dev/null b/gfx/tilesets/johto.2bpp.lz.0c7e555a differ

binary files /dev/null b/gfx/tilesets/johto.png differ

binary files a/gfx/tilesets/johto_1.2bpp.lz.0c7e555a /dev/null differ

binary files a/gfx/tilesets/johto_1.png /dev/null differ

--- a/gfx/tilesets/johto_1_palette_map.asm

+++ /dev/null

@@ -1,29 +1,0 @@

-	tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED

-	tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF

-	tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN

-	tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN

-	tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

-	tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW

-	tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

-	tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN

-	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY

-rept 16

-	db $ff

-endr

-	tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED

-	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED

-	tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN

-	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN

-	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN

-	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

binary files a/gfx/tilesets/johto_2.2bpp.lz.391603fb /dev/null differ

binary files a/gfx/tilesets/johto_2.png /dev/null differ

--- a/gfx/tilesets/johto_2_palette_map.asm

+++ /dev/null

@@ -1,29 +1,0 @@

-	tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF

-	tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF

-	tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN

-	tilepal 0, RED, RED, BROWN, BROWN, BROWN, GRAY, GREEN, GREEN

-	tilepal 0, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED

-	tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW

-	tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

-	tilepal 0, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY

-	tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY

-	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY

-rept 16

-	db $ff

-endr

-	tilepal 1, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF

-	tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF

-	tilepal 1, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, ROOF

-	tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, GRAY, GREEN, GREEN

-	tilepal 1, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED

-	tilepal 1, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW

-	tilepal 1, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

-	tilepal 1, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY

-	tilepal 1, GRAY, BROWN, BROWN, GRAY, RED, RED, GREEN, GREEN

-	tilepal 1, YELLOW, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF

binary files /dev/null b/gfx/tilesets/johto_modern.2bpp.lz.391603fb differ

binary files /dev/null b/gfx/tilesets/johto_modern.png differ

--- /dev/null

+++ b/gfx/tilesets/johto_modern_palette_map.asm

@@ -1,0 +1,29 @@

+	tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF

+	tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF

+	tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN

+	tilepal 0, RED, RED, BROWN, BROWN, BROWN, GRAY, GREEN, GREEN

+	tilepal 0, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED

+	tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW

+	tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

+	tilepal 0, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY

+	tilepal 0, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, GRAY

+	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY

+rept 16

+	db $ff

+endr

+	tilepal 1, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, ROOF

+	tilepal 1, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF

+	tilepal 1, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, ROOF

+	tilepal 1, ROOF, ROOF, ROOF, BROWN, BROWN, GRAY, GREEN, GREEN

+	tilepal 1, GRAY, GRAY, BROWN, RED, RED, GRAY, YELLOW, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, RED

+	tilepal 1, GRAY, BROWN, BROWN, GRAY, BROWN, GRAY, GRAY, YELLOW

+	tilepal 1, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

+	tilepal 1, RED, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY

+	tilepal 1, GRAY, BROWN, BROWN, GRAY, RED, RED, GREEN, GREEN

+	tilepal 1, YELLOW, ROOF, ROOF, ROOF, ROOF, ROOF, RED, ROOF

--- /dev/null

+++ b/gfx/tilesets/johto_palette_map.asm

@@ -1,0 +1,29 @@

+	tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED

+	tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF

+	tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN

+	tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN

+	tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

+	tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW

+	tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

+	tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN

+	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY

+rept 16

+	db $ff

+endr

+	tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED

+	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED

+	tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN

+	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN

+	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN

+	tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

binary files a/gfx/tilesets/kurts_house.2bpp.lz.dd51d079 /dev/null differ

binary files a/gfx/tilesets/kurts_house.png /dev/null differ

--- a/gfx/tilesets/kurts_house_palette_map.asm

+++ /dev/null

@@ -1,29 +1,0 @@

-	tilepal 0, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY

-	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY

-	tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY

-	tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN

-rept 16

-	db $ff

-endr

-	tilepal 1, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY

-	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY

-	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY

-	tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY

-	tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN

binary files /dev/null b/gfx/tilesets/mansion.2bpp.lz.63b414d4 differ

binary files /dev/null b/gfx/tilesets/mansion.png differ

--- /dev/null

+++ b/gfx/tilesets/mansion_1.pal

@@ -1,0 +1,44 @@

+	RGB 30, 28, 26

+	RGB 19, 19, 19

+	RGB 13, 13, 13

+	RGB 07, 07, 07

+	RGB 30, 28, 26

+	RGB 31, 19, 24

+	RGB 30, 10, 06

+	RGB 07, 07, 07

+	RGB 18, 24, 09

+	RGB 15, 20, 01

+	RGB 09, 13, 00

+	RGB 07, 07, 07

+	RGB 30, 28, 26

+	RGB 15, 16, 31

+	RGB 09, 09, 31

+	RGB 07, 07, 07

+	RGB 30, 28, 26

+	RGB 31, 31, 07

+	RGB 31, 16, 01

+	RGB 07, 07, 07

+	RGB 26, 24, 17

+	RGB 21, 17, 07

+	RGB 16, 13, 03

+	RGB 07, 07, 07

+	RGB 30, 28, 26

+	RGB 17, 19, 31

+	RGB 14, 16, 31

+	RGB 07, 07, 07

+	RGB 31, 31, 16

+	RGB 31, 31, 16

+	RGB 14, 09, 00

+	RGB 00, 00, 00

+	RGB 05, 05, 16

+	RGB 08, 19, 28

+	RGB 00, 00, 00

+	RGB 31, 31, 31

--- /dev/null

+++ b/gfx/tilesets/mansion_2.pal

@@ -1,0 +1,4 @@

+	RGB 25, 24, 23

+	RGB 20, 19, 19

+	RGB 14, 16, 31

+	RGB 07, 07, 07

--- /dev/null

+++ b/gfx/tilesets/mansion_palette_map.asm

@@ -1,0 +1,29 @@

+	tilepal 0, GRAY, BROWN, WATER, WATER, RED, WATER, GRAY, GRAY

+	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER

+	tilepal 0, GRAY, RED, WATER, WATER, WATER, WATER, GRAY, GRAY

+	tilepal 0, GRAY, GRAY, GRAY, GRAY, WATER, WATER, WATER, WATER

+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

+	tilepal 0, RED, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN

+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, BROWN, BROWN

+	tilepal 0, BROWN, GREEN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, GRAY, GRAY, GRAY, GRAY, GREEN, WATER, BROWN, BROWN

+	tilepal 0, BROWN, GREEN, BROWN, BROWN, WATER, WATER, BROWN, BROWN

+rept 16

+	db $ff

+endr

+	tilepal 1, YELLOW, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW, YELLOW

+	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, RED, RED, WATER, WATER

+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, YELLOW

+	tilepal 1, WATER, YELLOW, YELLOW, YELLOW, GREEN, GREEN, WATER, WATER

+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

+	tilepal 1, RED, RED, GRAY, YELLOW, RED, RED, YELLOW, WATER

+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

+	tilepal 1, YELLOW, YELLOW, GRAY, YELLOW, RED, RED, YELLOW, WATER

+	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, WATER, GRAY, GREEN

+	tilepal 1, YELLOW, YELLOW, WATER, YELLOW, WATER, WATER, YELLOW, YELLOW

+	tilepal 1, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN, GREEN

+	tilepal 1, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW, YELLOW

binary files a/gfx/tilesets/olivine_gym.2bpp.lz.93800351 /dev/null differ

binary files a/gfx/tilesets/olivine_gym.png /dev/null differ

--- a/gfx/tilesets/olivine_gym_palette_map.asm

+++ /dev/null

@@ -1,29 +1,0 @@

-	tilepal 0, GRAY, GREEN, GREEN, GREEN, RED, GRAY, GRAY, GRAY

-	tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY

-	tilepal 0, GRAY, GRAY, GREEN, GREEN, RED, GRAY, GRAY, GRAY

-	tilepal 0, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY, GRAY

-	tilepal 0, GRAY, GREEN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

-	tilepal 0, GRAY, GRAY, GRAY, GREEN, GREEN, YELLOW, RED, RED

-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

-	tilepal 0, GRAY, GRAY, GRAY, RED, RED, RED, RED, RED

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN

-	tilepal 0, GRAY, GRAY, RED, WATER, WATER, ROOF, GRAY, GRAY

-rept 16

-	db $ff

-endr

-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER

-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

-	tilepal 1, GRAY, GRAY, GRAY, RED, RED, GRAY, GRAY, GRAY

-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

-	tilepal 1, GRAY, RED, ROOF, RED, RED, RED, RED, RED

-	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED

-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER

-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, WATER

-	tilepal 1, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, WATER, WATER, WATER, WATER, WATER, WATER, WATER

-	tilepal 1, WATER, RED, GRAY, GRAY, RED, WATER, WATER, WATER

-	tilepal 1, WATER, WATER, WATER, WATER, WATER, WATER, WATER, GRAY

--- a/gfx/tilesets/palette_maps.asm

+++ b/gfx/tilesets/palette_maps.asm

@@ -15,16 +15,16 @@

 ; 0x4c0e5

 Tileset0PalMap: ; 0x4c0e5

-TilesetJohto1PalMap: ; 0x4c0e5

-INCLUDE "gfx/tilesets/johto_1_palette_map.asm"

+TilesetJohtoPalMap: ; 0x4c0e5

+INCLUDE "gfx/tilesets/johto_palette_map.asm"

 ; 0x4c155

-TilesetJohto2PalMap: ; 0x4c155

-INCLUDE "gfx/tilesets/johto_2_palette_map.asm"

+TilesetJohtoModernPalMap: ; 0x4c155

+INCLUDE "gfx/tilesets/johto_modern_palette_map.asm"

 ; 0x4c1c5

-TilesetHouse1PalMap: ; 0x4c1c5

-INCLUDE "gfx/tilesets/house_1_palette_map.asm"

+TilesetHousePalMap: ; 0x4c1c5

+INCLUDE "gfx/tilesets/house_palette_map.asm"

 ; 0x4c235

 TilesetPlayersHousePalMap: ; 0x4c235

@@ -47,8 +47,8 @@

 INCLUDE "gfx/tilesets/lab_palette_map.asm"

 ; 0x4c465

-TilesetPowerPlantPalMap: ; 0x4c465

-INCLUDE "gfx/tilesets/power_plant_palette_map.asm"

+TilesetFacilityPalMap: ; 0x4c465

+INCLUDE "gfx/tilesets/facility_palette_map.asm"

 ; 0x4c4d5

 TilesetMartPalMap: ; 0x4c4d5

@@ -55,8 +55,8 @@

 INCLUDE "gfx/tilesets/mart_palette_map.asm"

 ; 0x4c545

-TilesetCeladonMansionPalMap: ; 0x4c545

-INCLUDE "gfx/tilesets/celadon_mansion_palette_map.asm"

+TilesetMansionPalMap: ; 0x4c545

+INCLUDE "gfx/tilesets/mansion_palette_map.asm"

 ; 0x4c5b5

 TilesetGameCornerPalMap: ; 0x4c5b5

@@ -63,20 +63,20 @@

 INCLUDE "gfx/tilesets/game_corner_palette_map.asm"

 ; 0x4c625

-TilesetGym1PalMap: ; 0x4c625

-INCLUDE "gfx/tilesets/gym_1_palette_map.asm"

+TilesetEliteFourRoomPalMap: ; 0x4c625

+INCLUDE "gfx/tilesets/elite_four_room_palette_map.asm"

 ; 0x4c695

-TilesetKurtsHousePalMap: ; 0x4c695

-INCLUDE "gfx/tilesets/kurts_house_palette_map.asm"

+TilesetTraditionalHousePalMap: ; 0x4c695

+INCLUDE "gfx/tilesets/traditional_house_palette_map.asm"

 ; 0x4c705

-TilesetSproutTowerPalMap: ; 0x4c705

-INCLUDE "gfx/tilesets/sprout_tower_palette_map.asm"

+TilesetTowerPalMap: ; 0x4c705

+INCLUDE "gfx/tilesets/tower_palette_map.asm"

 ; 0x4c775

 TilesetCavePalMap: ; 0x4c775

-TilesetWhirlIslandsPalMap: ; 0x4c775

+TilesetDarkCavePalMap: ; 0x4c775

 INCLUDE "gfx/tilesets/cave_palette_map.asm"

 ; 0x4c7e5

@@ -105,8 +105,8 @@

 INCLUDE "gfx/tilesets/underground_palette_map.asm"

 ; 0x4ca15

-TilesetOlivineGymPalMap: ; 0x4ca15

-INCLUDE "gfx/tilesets/olivine_gym_palette_map.asm"

+TilesetChampionsRoomPalMap: ; 0x4ca15

+INCLUDE "gfx/tilesets/champions_room_palette_map.asm"

 ; 0x4ca85

 TilesetLighthousePalMap: ; 0x4ca85

@@ -113,8 +113,8 @@

 INCLUDE "gfx/tilesets/lighthouse_palette_map.asm"

 ; 0x4caf5

-TilesetPlayersHouse2FPalMap: ; 0x4caf5

-INCLUDE "gfx/tilesets/players_house_2f_palette_map.asm"

+TilesetPlayersRoomPalMap: ; 0x4caf5

+INCLUDE "gfx/tilesets/players_room_palette_map.asm"

 ; 0x4cb65

 UnusedMuseumPalMap: ; 0x4cb65

@@ -125,8 +125,8 @@

 INCLUDE "gfx/tilesets/ice_path_palette_map.asm"

 ; 0x4cc45

-TilesetIlexForestPalMap: ; 0x4cc45

-INCLUDE "gfx/tilesets/ilex_forest_palette_map.asm"

+TilesetForestPalMap: ; 0x4cc45

+INCLUDE "gfx/tilesets/forest_palette_map.asm"

 ; 0x4ccb5

 TilesetPokeComCenterPalMap: ; 0x4ccb5

binary files a/gfx/tilesets/players_house_2f.2bpp.lz.35e51007 /dev/null differ

binary files a/gfx/tilesets/players_house_2f.png /dev/null differ

--- a/gfx/tilesets/players_house_2f_palette_map.asm

+++ /dev/null

@@ -1,29 +1,0 @@

-	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

-	tilepal 0, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED

-	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

-	tilepal 0, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED

-	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

-	tilepal 0, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED

-	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

-	tilepal 0, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED

-	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN

-	tilepal 0, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW

-	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN

-	tilepal 0, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW

-rept 16

-	db $ff

-endr

-	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

-	tilepal 1, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED

-	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

-	tilepal 1, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED

-	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

-	tilepal 1, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED

-	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

-	tilepal 1, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED

-	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN

-	tilepal 1, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW

-	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN

-	tilepal 1, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW

binary files /dev/null b/gfx/tilesets/players_room.2bpp.lz.35e51007 differ

binary files /dev/null b/gfx/tilesets/players_room.png differ

--- /dev/null

+++ b/gfx/tilesets/players_room_palette_map.asm

@@ -1,0 +1,29 @@

+	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

+	tilepal 0, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED

+	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

+	tilepal 0, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED

+	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

+	tilepal 0, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED

+	tilepal 0, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

+	tilepal 0, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED

+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN

+	tilepal 0, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW

+	tilepal 0, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN

+	tilepal 0, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW

+rept 16

+	db $ff

+endr

+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

+	tilepal 1, GREEN, RED, RED, GRAY, GRAY, RED, RED, RED

+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

+	tilepal 1, GREEN, RED, RED, GRAY, GRAY, WATER, RED, RED

+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

+	tilepal 1, GREEN, ROOF, ROOF, GRAY, GRAY, YELLOW, RED, RED

+	tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY, GREEN

+	tilepal 1, GREEN, ROOF, ROOF, WATER, WATER, GREEN, RED, RED

+	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN

+	tilepal 1, GREEN, YELLOW, YELLOW, WATER, WATER, BROWN, YELLOW, YELLOW

+	tilepal 1, GRAY, GRAY, GRAY, GRAY, BROWN, BROWN, BROWN, GREEN

+	tilepal 1, GREEN, YELLOW, YELLOW, GRAY, GRAY, BROWN, YELLOW, YELLOW

binary files a/gfx/tilesets/power_plant.2bpp.lz.454cfd8b /dev/null differ

binary files a/gfx/tilesets/power_plant.png /dev/null differ

--- a/gfx/tilesets/power_plant_palette_map.asm

+++ /dev/null

@@ -1,29 +1,0 @@

-	tilepal 0, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN

-	tilepal 0, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

-	tilepal 0, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN

-	tilepal 0, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN

-	tilepal 0, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED

-	tilepal 0, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER

-	tilepal 0, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF

-	tilepal 0, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY

-rept 16

-	db $ff

-endr

-	tilepal 1, GRAY, WATER, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, GRAY, GRAY, RED, RED, BROWN, BROWN

-	tilepal 1, ROOF, ROOF, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

-	tilepal 1, ROOF, ROOF, GRAY, GRAY, ROOF, ROOF, BROWN, BROWN

-	tilepal 1, ROOF, ROOF, GREEN, WATER, WATER, WATER, RED, RED

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN

-	tilepal 1, ROOF, ROOF, GREEN, GREEN, RED, RED, GRAY, RED

-	tilepal 1, RED, RED, BROWN, BROWN, GREEN, GREEN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, GREEN, GREEN, GRAY, BROWN, WATER

-	tilepal 1, BROWN, BROWN, GRAY, BROWN, BROWN, BROWN, BROWN, GRAY

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, BROWN, ROOF

-	tilepal 1, ROOF, ROOF, GRAY, BROWN, GRAY, GRAY, GRAY, GRAY

binary files a/gfx/tilesets/sprout-pillar/1.png /dev/null differ

binary files a/gfx/tilesets/sprout-pillar/10.png /dev/null differ

binary files a/gfx/tilesets/sprout-pillar/2.png /dev/null differ

binary files a/gfx/tilesets/sprout-pillar/3.png /dev/null differ

binary files a/gfx/tilesets/sprout-pillar/4.png /dev/null differ

binary files a/gfx/tilesets/sprout-pillar/5.png /dev/null differ

binary files a/gfx/tilesets/sprout-pillar/6.png /dev/null differ

binary files a/gfx/tilesets/sprout-pillar/7.png /dev/null differ

binary files a/gfx/tilesets/sprout-pillar/8.png /dev/null differ

binary files a/gfx/tilesets/sprout-pillar/9.png /dev/null differ

binary files a/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c /dev/null differ

binary files a/gfx/tilesets/sprout_tower.png /dev/null differ

--- a/gfx/tilesets/sprout_tower_palette_map.asm

+++ /dev/null

@@ -1,29 +1,0 @@

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED

-	tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED

-	tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

-	tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

-	tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-rept 16

-	db $ff

-endr

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED

-	tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED

-	tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

-	tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

-	tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN

binary files /dev/null b/gfx/tilesets/tower-pillar/1.png differ

binary files /dev/null b/gfx/tilesets/tower-pillar/10.png differ

binary files /dev/null b/gfx/tilesets/tower-pillar/2.png differ

binary files /dev/null b/gfx/tilesets/tower-pillar/3.png differ

binary files /dev/null b/gfx/tilesets/tower-pillar/4.png differ

binary files /dev/null b/gfx/tilesets/tower-pillar/5.png differ

binary files /dev/null b/gfx/tilesets/tower-pillar/6.png differ

binary files /dev/null b/gfx/tilesets/tower-pillar/7.png differ

binary files /dev/null b/gfx/tilesets/tower-pillar/8.png differ

binary files /dev/null b/gfx/tilesets/tower-pillar/9.png differ

binary files /dev/null b/gfx/tilesets/tower.2bpp.lz.bc56789c differ

binary files /dev/null b/gfx/tilesets/tower.png differ

--- /dev/null

+++ b/gfx/tilesets/tower_palette_map.asm

@@ -1,0 +1,29 @@

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED

+	tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED

+	tilepal 0, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

+	tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

+	tilepal 0, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+rept 16

+	db $ff

+endr

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, RED

+	tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, RED

+	tilepal 1, RED, RED, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

+	tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

+	tilepal 1, RED, RED, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, YELLOW, YELLOW, YELLOW, BROWN, BROWN, BROWN

binary files /dev/null b/gfx/tilesets/traditional_house.2bpp.lz.dd51d079 differ

binary files /dev/null b/gfx/tilesets/traditional_house.png differ

--- /dev/null

+++ b/gfx/tilesets/traditional_house_palette_map.asm

@@ -1,0 +1,29 @@

+	tilepal 0, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY

+	tilepal 0, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY

+	tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY

+	tilepal 0, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN

+	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN

+rept 16

+	db $ff

+endr

+	tilepal 1, GRAY, BROWN, WATER, WATER, RED, GRAY, GRAY, GRAY

+	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, WATER, WATER, RED, BROWN, GRAY, GRAY

+	tilepal 1, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY

+	tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, RED, GRAY

+	tilepal 1, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, WATER

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN, BROWN

+	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, WATER, BROWN

binary files a/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 /dev/null differ

binary files a/gfx/tilesets/whirl_islands.png /dev/null differ

--- a/gfx/tilesets/whirl_islands_palette_map.asm

+++ /dev/null

@@ -1,29 +1,0 @@

-	tilepal 0, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN

-	tilepal 0, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN

-	tilepal 0, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

-	tilepal 0, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY

-	tilepal 0, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

-	tilepal 0, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

-rept 16

-	db $ff

-endr

-	tilepal 1, BROWN, BROWN, GRAY, GRAY, GREEN, BROWN, BROWN, BROWN

-	tilepal 1, GRAY, GRAY, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, GRAY, GRAY, WATER, BROWN, BROWN, BROWN

-	tilepal 1, GRAY, GRAY, YELLOW, YELLOW, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY

-	tilepal 1, BROWN, BROWN, BROWN, BROWN, GRAY, GRAY, GRAY, GRAY

-	tilepal 1, WATER, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

-	tilepal 1, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY

--- a/home/map.asm

+++ b/home/map.asm

@@ -1431,9 +1431,9 @@

 ; These tilesets support dynamic per-mapgroup roof tiles.

 	ld a, [wTileset]

-	cp TILESET_JOHTO_1

+	cp TILESET_JOHTO

 	jr z, .load_roof

-	cp TILESET_JOHTO_2

+	cp TILESET_JOHTO_MODERN

 	jr z, .load_roof

 	cp TILESET_BATTLE_TOWER_OUTSIDE

 	jr z, .load_roof