diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
index bb5381657..5fda5bd5b 100644
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -1,36 +1,36 @@
; 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
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
diff --git a/data/field_move_blocks.asm b/data/field_move_blocks.asm
index ae062196b..d97fdc995 100644
--- 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 @@ CutTreeBlockPointers: ; c862
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,14 +37,14 @@ CutTreeBlockPointers: ; c862
db $03, $04, 1 ; grass
db -1 ; end
-.ilex_forest:
+.forest:
; facing block, replacement block, animation
db $0f, $17, 0
db -1 ; end
WhirlpoolBlockPointers: ; c8a4
- dbw TILESET_JOHTO_1, .johto
+ dbw TILESET_JOHTO, .johto
db -1 ; end
.johto:
diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm
index fd8ad3a33..44cb85ac6 100644
--- a/data/maps/definitions.asm
+++ b/data/maps/definitions.asm
@@ -46,43 +46,43 @@ MapGroupPointers::
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 @@ MapGroup_Dungeons:
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 @@ MapGroup_Dungeons:
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,17 +196,17 @@ MapGroup_Cinnabar:
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
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_Cerulean:
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 @@ MapGroup_Violet:
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 @@ MapGroup_Goldenrod:
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 @@ MapGroup_Pallet:
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 @@ MapGroup_FastShip:
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 @@ MapGroup_Fuchsia:
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,28 +355,28 @@ MapGroup_Lavender:
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
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,33 +390,33 @@ MapGroup_Celadon:
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
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 @@ MapGroup_Viridian:
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 @@ MapGroup_Saffron:
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
diff --git a/data/tilesets.asm b/data/tilesets.asm
index e7f68d894..c44a218fc 100644
--- a/data/tilesets.asm
+++ b/data/tilesets.asm
@@ -13,37 +13,37 @@ ENDM
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
tileset TilesetRadioTower
tileset TilesetUnderground
tileset TilesetIcePath
- tileset TilesetWhirlIslands
- tileset TilesetIlexForest
+ tileset TilesetDarkCave
+ tileset TilesetForest
tileset TilesetBetaWordRoom
tileset TilesetHoOhWordRoom
tileset TilesetKabutoWordRoom
diff --git a/data/tilesets/olivine_gym_collision.asm b/data/tilesets/champions_room_collision.asm
similarity index 100%
rename from data/tilesets/olivine_gym_collision.asm
rename to data/tilesets/champions_room_collision.asm
diff --git a/data/tilesets/olivine_gym_metatiles.bin b/data/tilesets/champions_room_metatiles.bin
similarity index 100%
rename from data/tilesets/olivine_gym_metatiles.bin
rename to data/tilesets/champions_room_metatiles.bin
diff --git a/data/tilesets/whirl_islands_collision.asm b/data/tilesets/dark_cave_collision.asm
similarity index 100%
rename from data/tilesets/whirl_islands_collision.asm
rename to data/tilesets/dark_cave_collision.asm
diff --git a/data/tilesets/whirl_islands_metatiles.bin b/data/tilesets/dark_cave_metatiles.bin
similarity index 100%
rename from data/tilesets/whirl_islands_metatiles.bin
rename to data/tilesets/dark_cave_metatiles.bin
diff --git a/data/tilesets/gym_1_collision.asm b/data/tilesets/elite_four_room_collision.asm
similarity index 100%
rename from data/tilesets/gym_1_collision.asm
rename to data/tilesets/elite_four_room_collision.asm
diff --git a/data/tilesets/gym_1_metatiles.bin b/data/tilesets/elite_four_room_metatiles.bin
similarity index 100%
rename from data/tilesets/gym_1_metatiles.bin
rename to data/tilesets/elite_four_room_metatiles.bin
diff --git a/data/tilesets/power_plant_collision.asm b/data/tilesets/facility_collision.asm
similarity index 100%
rename from data/tilesets/power_plant_collision.asm
rename to data/tilesets/facility_collision.asm
diff --git a/data/tilesets/power_plant_metatiles.bin b/data/tilesets/facility_metatiles.bin
similarity index 100%
rename from data/tilesets/power_plant_metatiles.bin
rename to data/tilesets/facility_metatiles.bin
diff --git a/data/tilesets/ilex_forest_collision.asm b/data/tilesets/forest_collision.asm
similarity index 100%
rename from data/tilesets/ilex_forest_collision.asm
rename to data/tilesets/forest_collision.asm
diff --git a/data/tilesets/ilex_forest_metatiles.bin b/data/tilesets/forest_metatiles.bin
similarity index 100%
rename from data/tilesets/ilex_forest_metatiles.bin
rename to data/tilesets/forest_metatiles.bin
diff --git a/data/tilesets/house_1_collision.asm b/data/tilesets/house_collision.asm
similarity index 100%
rename from data/tilesets/house_1_collision.asm
rename to data/tilesets/house_collision.asm
diff --git a/data/tilesets/house_1_metatiles.bin b/data/tilesets/house_metatiles.bin
similarity index 100%
rename from data/tilesets/house_1_metatiles.bin
rename to data/tilesets/house_metatiles.bin
diff --git a/data/tilesets/johto_1_collision.asm b/data/tilesets/johto_collision.asm
similarity index 100%
rename from data/tilesets/johto_1_collision.asm
rename to data/tilesets/johto_collision.asm
diff --git a/data/tilesets/johto_1_metatiles.bin b/data/tilesets/johto_metatiles.bin
similarity index 100%
rename from data/tilesets/johto_1_metatiles.bin
rename to data/tilesets/johto_metatiles.bin
diff --git a/data/tilesets/johto_2_collision.asm b/data/tilesets/johto_modern_collision.asm
similarity index 100%
rename from data/tilesets/johto_2_collision.asm
rename to data/tilesets/johto_modern_collision.asm
diff --git a/data/tilesets/johto_2_metatiles.bin b/data/tilesets/johto_modern_metatiles.bin
similarity index 100%
rename from data/tilesets/johto_2_metatiles.bin
rename to data/tilesets/johto_modern_metatiles.bin
diff --git a/data/tilesets/celadon_mansion_collision.asm b/data/tilesets/mansion_collision.asm
similarity index 100%
rename from data/tilesets/celadon_mansion_collision.asm
rename to data/tilesets/mansion_collision.asm
diff --git a/data/tilesets/celadon_mansion_metatiles.bin b/data/tilesets/mansion_metatiles.bin
similarity index 100%
rename from data/tilesets/celadon_mansion_metatiles.bin
rename to data/tilesets/mansion_metatiles.bin
diff --git a/data/tilesets/players_house_2f_collision.asm b/data/tilesets/players_room_collision.asm
similarity index 100%
rename from data/tilesets/players_house_2f_collision.asm
rename to data/tilesets/players_room_collision.asm
diff --git a/data/tilesets/players_house_2f_metatiles.bin b/data/tilesets/players_room_metatiles.bin
similarity index 100%
rename from data/tilesets/players_house_2f_metatiles.bin
rename to data/tilesets/players_room_metatiles.bin
diff --git a/data/tilesets/sprout_tower_collision.asm b/data/tilesets/tower_collision.asm
similarity index 100%
rename from data/tilesets/sprout_tower_collision.asm
rename to data/tilesets/tower_collision.asm
diff --git a/data/tilesets/sprout_tower_metatiles.bin b/data/tilesets/tower_metatiles.bin
similarity index 100%
rename from data/tilesets/sprout_tower_metatiles.bin
rename to data/tilesets/tower_metatiles.bin
diff --git a/data/tilesets/kurts_house_collision.asm b/data/tilesets/traditional_house_collision.asm
similarity index 100%
rename from data/tilesets/kurts_house_collision.asm
rename to data/tilesets/traditional_house_collision.asm
diff --git a/data/tilesets/kurts_house_metatiles.bin b/data/tilesets/traditional_house_metatiles.bin
similarity index 100%
rename from data/tilesets/kurts_house_metatiles.bin
rename to data/tilesets/traditional_house_metatiles.bin
diff --git a/data/tilesets/unused_whirl_islands_collision.asm b/data/tilesets/unused_dark_cave_collision.asm
similarity index 100%
rename from data/tilesets/unused_whirl_islands_collision.asm
rename to data/tilesets/unused_dark_cave_collision.asm
diff --git a/data/tilesets/unused_whirl_islands_metatiles.bin b/data/tilesets/unused_dark_cave_metatiles.bin
similarity index 100%
rename from data/tilesets/unused_whirl_islands_metatiles.bin
rename to data/tilesets/unused_dark_cave_metatiles.bin
diff --git a/docs/map_scripts.md b/docs/map_scripts.md
index d9396ed5b..2302257e7 100644
--- a/docs/map_scripts.md
+++ b/docs/map_scripts.md
@@ -118,7 +118,7 @@ BG event types:
### .ObjectEvents: db N
- object_event x, y, sprite, movement, rx, ry, h1, h2, palette, type, range, script, event_flag
+ object_event x, y, sprite, movement, rx, ry, h1, h2, palette, type, range, script, event_flag
Movement types:
diff --git a/engine/tileset_anims.asm b/engine/tileset_anims.asm
index 74679b1ee..5113ae9a3 100644
--- a/engine/tileset_anims.asm
+++ b/engine/tileset_anims.asm
@@ -35,7 +35,7 @@ _AnimateTileset:: ; fc000
; fc01b
Tileset0Anim: ; 0xfc01b
-TilesetJohto2Anim: ; 0xfc01b
+TilesetJohtoModernAnim: ; 0xfc01b
TilesetKantoAnim: ; 0xfc01b
dw vTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation
@@ -64,7 +64,7 @@ TilesetParkAnim: ; 0xfc047
dw NULL, DoneTileAnimation
; 0xfc073
-TilesetIlexForestAnim: ; 0xfc073
+TilesetForestAnim: ; 0xfc073
dw NULL, ForestTreeLeftAnimation
dw NULL, ForestTreeRightAnimation
dw NULL, WaitTileAnimation
@@ -79,7 +79,7 @@ TilesetIlexForestAnim: ; 0xfc073
dw NULL, DoneTileAnimation
; 0xfc0a3
-TilesetJohto1Anim: ; 0xfc0a3
+TilesetJohtoAnim: ; 0xfc0a3
dw vTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -138,7 +138,7 @@ TilesetPortAnim: ; 0xfc12f
dw NULL, DoneTileAnimation
; 0xfc15f
-TilesetGym1Anim: ; 0xfc15f
+TilesetEliteFourRoomAnim: ; 0xfc15f
dw NULL, LavaBubbleAnim2
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -182,7 +182,7 @@ UnusedTilesetAnim_fc1af: ; 0xfc1af
; 0xfc1e7
TilesetCaveAnim: ; 0xfc1e7
-TilesetWhirlIslandsAnim: ; 0xfc1e7
+TilesetDarkCaveAnim: ; 0xfc1e7
dw vTiles2 tile $14, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette
dw wTileAnimBuffer, ScrollTileRightLeft
@@ -226,17 +226,17 @@ TilesetIcePathAnim: ; 0xfc233
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 @@ UnusedTilesetAnim_fc2bf: ; 0xfc2bf
; 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 @@ LavaBubbleFrames: ; fc605
; 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 @@ FlickeringCaveEntrancePalette: ; fc71e
; 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
diff --git a/engine/tileset_palettes.asm b/engine/tileset_palettes.asm
index 9aba2f20e..5a2190fc7 100644
--- a/engine/tileset_palettes.asm
+++ b/engine/tileset_palettes.asm
@@ -6,11 +6,11 @@ LoadSpecialMapPalette: ; 494ac
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 @@ LoadHousePalette: ; 495df
; 495ee
HousePalette: ; 495ee
-INCLUDE "gfx/tilesets/house_1.pal"
+INCLUDE "gfx/tilesets/house.pal"
; 4962e
LoadRadioTowerPalette: ; 4962e
@@ -119,7 +119,7 @@ INCLUDE "gfx/tilesets/radio_tower.pal"
; 4967d
MansionPalette1: ; 4967d
-INCLUDE "gfx/tilesets/celadon_mansion_1.pal"
+INCLUDE "gfx/tilesets/mansion_1.pal"
; 496c5
LoadMansionPalette: ; 496c5
@@ -147,5 +147,5 @@ LoadMansionPalette: ; 496c5
; 496fe
MansionPalette2: ; 496fe
-INCLUDE "gfx/tilesets/celadon_mansion_2.pal"
+INCLUDE "gfx/tilesets/mansion_2.pal"
; 49706
diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm
index 0f4dcbb34..f6d6b465f 100644
--- a/gfx/tilesets.asm
+++ b/gfx/tilesets.asm
@@ -19,18 +19,18 @@ INCLUDE "data/tilesets/kanto_collision.asm"
; 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 @@ TilesetIcePathColl: ; 0x1b33e
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 @@ TilesetPlayersHouseColl: ; 0x1dd2c
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,28 +113,28 @@ INCBIN "gfx/tilesets/cave.2bpp.lz"
; 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
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 @@ TilesetTrainStationColl: ; 0x23791
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 @@ TilesetUndergroundColl: ; 0x325b0
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 @@ TilesetGateColl: ; 0xb5de0
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 @@ TilesetLighthouseColl: ; 0xde370
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
diff --git a/gfx/tilesets/olivine_gym.2bpp.lz.93800351 b/gfx/tilesets/champions_room.2bpp.lz.93800351
similarity index 100%
rename from gfx/tilesets/olivine_gym.2bpp.lz.93800351
rename to gfx/tilesets/champions_room.2bpp.lz.93800351
diff --git a/gfx/tilesets/olivine_gym.png b/gfx/tilesets/champions_room.png
similarity index 100%
rename from gfx/tilesets/olivine_gym.png
rename to gfx/tilesets/champions_room.png
diff --git a/gfx/tilesets/olivine_gym_palette_map.asm b/gfx/tilesets/champions_room_palette_map.asm
similarity index 100%
rename from gfx/tilesets/olivine_gym_palette_map.asm
rename to gfx/tilesets/champions_room_palette_map.asm
diff --git a/gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6 b/gfx/tilesets/dark_cave.2bpp.lz.25b9c4b6
similarity index 100%
rename from gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6
rename to gfx/tilesets/dark_cave.2bpp.lz.25b9c4b6
diff --git a/gfx/tilesets/whirl_islands.png b/gfx/tilesets/dark_cave.png
similarity index 100%
rename from gfx/tilesets/whirl_islands.png
rename to gfx/tilesets/dark_cave.png
diff --git a/gfx/tilesets/whirl_islands_palette_map.asm b/gfx/tilesets/dark_cave_palette_map.asm
similarity index 100%
rename from gfx/tilesets/whirl_islands_palette_map.asm
rename to gfx/tilesets/dark_cave_palette_map.asm
diff --git a/gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f b/gfx/tilesets/elite_four_room.2bpp.lz.c1f2ed8f
similarity index 100%
rename from gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f
rename to gfx/tilesets/elite_four_room.2bpp.lz.c1f2ed8f
diff --git a/gfx/tilesets/gym_1.png b/gfx/tilesets/elite_four_room.png
similarity index 100%
rename from gfx/tilesets/gym_1.png
rename to gfx/tilesets/elite_four_room.png
diff --git a/gfx/tilesets/gym_1_palette_map.asm b/gfx/tilesets/elite_four_room_palette_map.asm
similarity index 100%
rename from gfx/tilesets/gym_1_palette_map.asm
rename to gfx/tilesets/elite_four_room_palette_map.asm
diff --git a/gfx/tilesets/power_plant.2bpp.lz.454cfd8b b/gfx/tilesets/facility.2bpp.lz.454cfd8b
similarity index 100%
rename from gfx/tilesets/power_plant.2bpp.lz.454cfd8b
rename to gfx/tilesets/facility.2bpp.lz.454cfd8b
diff --git a/gfx/tilesets/power_plant.png b/gfx/tilesets/facility.png
similarity index 100%
rename from gfx/tilesets/power_plant.png
rename to gfx/tilesets/facility.png
diff --git a/gfx/tilesets/power_plant_palette_map.asm b/gfx/tilesets/facility_palette_map.asm
similarity index 100%
rename from gfx/tilesets/power_plant_palette_map.asm
rename to gfx/tilesets/facility_palette_map.asm
diff --git a/gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896 b/gfx/tilesets/forest.2bpp.lz.6b0ac896
similarity index 100%
rename from gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896
rename to gfx/tilesets/forest.2bpp.lz.6b0ac896
diff --git a/gfx/tilesets/ilex_forest.png b/gfx/tilesets/forest.png
similarity index 100%
rename from gfx/tilesets/ilex_forest.png
rename to gfx/tilesets/forest.png
diff --git a/gfx/tilesets/ilex_forest_palette_map.asm b/gfx/tilesets/forest_palette_map.asm
similarity index 100%
rename from gfx/tilesets/ilex_forest_palette_map.asm
rename to gfx/tilesets/forest_palette_map.asm
diff --git a/gfx/tilesets/house_1.2bpp.lz.c848ef13 b/gfx/tilesets/house.2bpp.lz.c848ef13
similarity index 100%
rename from gfx/tilesets/house_1.2bpp.lz.c848ef13
rename to gfx/tilesets/house.2bpp.lz.c848ef13
diff --git a/gfx/tilesets/house_1.pal b/gfx/tilesets/house.pal
similarity index 100%
rename from gfx/tilesets/house_1.pal
rename to gfx/tilesets/house.pal
diff --git a/gfx/tilesets/house_1.png b/gfx/tilesets/house.png
similarity index 100%
rename from gfx/tilesets/house_1.png
rename to gfx/tilesets/house.png
diff --git a/gfx/tilesets/house_1_palette_map.asm b/gfx/tilesets/house_palette_map.asm
similarity index 100%
rename from gfx/tilesets/house_1_palette_map.asm
rename to gfx/tilesets/house_palette_map.asm
diff --git a/gfx/tilesets/johto_1.2bpp.lz.0c7e555a b/gfx/tilesets/johto.2bpp.lz.0c7e555a
similarity index 100%
rename from gfx/tilesets/johto_1.2bpp.lz.0c7e555a
rename to gfx/tilesets/johto.2bpp.lz.0c7e555a
diff --git a/gfx/tilesets/johto_1.png b/gfx/tilesets/johto.png
similarity index 100%
rename from gfx/tilesets/johto_1.png
rename to gfx/tilesets/johto.png
diff --git a/gfx/tilesets/johto_2.2bpp.lz.391603fb b/gfx/tilesets/johto_modern.2bpp.lz.391603fb
similarity index 100%
rename from gfx/tilesets/johto_2.2bpp.lz.391603fb
rename to gfx/tilesets/johto_modern.2bpp.lz.391603fb
diff --git a/gfx/tilesets/johto_2.png b/gfx/tilesets/johto_modern.png
similarity index 100%
rename from gfx/tilesets/johto_2.png
rename to gfx/tilesets/johto_modern.png
diff --git a/gfx/tilesets/johto_2_palette_map.asm b/gfx/tilesets/johto_modern_palette_map.asm
similarity index 100%
rename from gfx/tilesets/johto_2_palette_map.asm
rename to gfx/tilesets/johto_modern_palette_map.asm
diff --git a/gfx/tilesets/johto_1_palette_map.asm b/gfx/tilesets/johto_palette_map.asm
similarity index 100%
rename from gfx/tilesets/johto_1_palette_map.asm
rename to gfx/tilesets/johto_palette_map.asm
diff --git a/gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4 b/gfx/tilesets/mansion.2bpp.lz.63b414d4
similarity index 100%
rename from gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4
rename to gfx/tilesets/mansion.2bpp.lz.63b414d4
diff --git a/gfx/tilesets/celadon_mansion.png b/gfx/tilesets/mansion.png
similarity index 100%
rename from gfx/tilesets/celadon_mansion.png
rename to gfx/tilesets/mansion.png
diff --git a/gfx/tilesets/celadon_mansion_1.pal b/gfx/tilesets/mansion_1.pal
similarity index 100%
rename from gfx/tilesets/celadon_mansion_1.pal
rename to gfx/tilesets/mansion_1.pal
diff --git a/gfx/tilesets/celadon_mansion_2.pal b/gfx/tilesets/mansion_2.pal
similarity index 100%
rename from gfx/tilesets/celadon_mansion_2.pal
rename to gfx/tilesets/mansion_2.pal
diff --git a/gfx/tilesets/celadon_mansion_palette_map.asm b/gfx/tilesets/mansion_palette_map.asm
similarity index 100%
rename from gfx/tilesets/celadon_mansion_palette_map.asm
rename to gfx/tilesets/mansion_palette_map.asm
diff --git a/gfx/tilesets/palette_maps.asm b/gfx/tilesets/palette_maps.asm
index b67daeb8d..5e8f9f4eb 100644
--- a/gfx/tilesets/palette_maps.asm
+++ b/gfx/tilesets/palette_maps.asm
@@ -15,16 +15,16 @@ INCLUDE "gfx/tilesets/kanto_palette_map.asm"
; 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,36 +47,36 @@ TilesetLabPalMap: ; 0x4c3f5
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
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
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,16 +105,16 @@ TilesetUndergroundPalMap: ; 0x4c9a5
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
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 @@ TilesetIcePathPalMap: ; 0x4cbd5
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
diff --git a/gfx/tilesets/players_house_2f.2bpp.lz.35e51007 b/gfx/tilesets/players_room.2bpp.lz.35e51007
similarity index 100%
rename from gfx/tilesets/players_house_2f.2bpp.lz.35e51007
rename to gfx/tilesets/players_room.2bpp.lz.35e51007
diff --git a/gfx/tilesets/players_house_2f.png b/gfx/tilesets/players_room.png
similarity index 100%
rename from gfx/tilesets/players_house_2f.png
rename to gfx/tilesets/players_room.png
diff --git a/gfx/tilesets/players_house_2f_palette_map.asm b/gfx/tilesets/players_room_palette_map.asm
similarity index 100%
rename from gfx/tilesets/players_house_2f_palette_map.asm
rename to gfx/tilesets/players_room_palette_map.asm
diff --git a/gfx/tilesets/sprout-pillar/1.png b/gfx/tilesets/tower-pillar/1.png
similarity index 100%
rename from gfx/tilesets/sprout-pillar/1.png
rename to gfx/tilesets/tower-pillar/1.png
diff --git a/gfx/tilesets/sprout-pillar/10.png b/gfx/tilesets/tower-pillar/10.png
similarity index 100%
rename from gfx/tilesets/sprout-pillar/10.png
rename to gfx/tilesets/tower-pillar/10.png
diff --git a/gfx/tilesets/sprout-pillar/2.png b/gfx/tilesets/tower-pillar/2.png
similarity index 100%
rename from gfx/tilesets/sprout-pillar/2.png
rename to gfx/tilesets/tower-pillar/2.png
diff --git a/gfx/tilesets/sprout-pillar/3.png b/gfx/tilesets/tower-pillar/3.png
similarity index 100%
rename from gfx/tilesets/sprout-pillar/3.png
rename to gfx/tilesets/tower-pillar/3.png
diff --git a/gfx/tilesets/sprout-pillar/4.png b/gfx/tilesets/tower-pillar/4.png
similarity index 100%
rename from gfx/tilesets/sprout-pillar/4.png
rename to gfx/tilesets/tower-pillar/4.png
diff --git a/gfx/tilesets/sprout-pillar/5.png b/gfx/tilesets/tower-pillar/5.png
similarity index 100%
rename from gfx/tilesets/sprout-pillar/5.png
rename to gfx/tilesets/tower-pillar/5.png
diff --git a/gfx/tilesets/sprout-pillar/6.png b/gfx/tilesets/tower-pillar/6.png
similarity index 100%
rename from gfx/tilesets/sprout-pillar/6.png
rename to gfx/tilesets/tower-pillar/6.png
diff --git a/gfx/tilesets/sprout-pillar/7.png b/gfx/tilesets/tower-pillar/7.png
similarity index 100%
rename from gfx/tilesets/sprout-pillar/7.png
rename to gfx/tilesets/tower-pillar/7.png
diff --git a/gfx/tilesets/sprout-pillar/8.png b/gfx/tilesets/tower-pillar/8.png
similarity index 100%
rename from gfx/tilesets/sprout-pillar/8.png
rename to gfx/tilesets/tower-pillar/8.png
diff --git a/gfx/tilesets/sprout-pillar/9.png b/gfx/tilesets/tower-pillar/9.png
similarity index 100%
rename from gfx/tilesets/sprout-pillar/9.png
rename to gfx/tilesets/tower-pillar/9.png
diff --git a/gfx/tilesets/sprout_tower.2bpp.lz.bc56789c b/gfx/tilesets/tower.2bpp.lz.bc56789c
similarity index 100%
rename from gfx/tilesets/sprout_tower.2bpp.lz.bc56789c
rename to gfx/tilesets/tower.2bpp.lz.bc56789c
diff --git a/gfx/tilesets/sprout_tower.png b/gfx/tilesets/tower.png
similarity index 100%
rename from gfx/tilesets/sprout_tower.png
rename to gfx/tilesets/tower.png
diff --git a/gfx/tilesets/sprout_tower_palette_map.asm b/gfx/tilesets/tower_palette_map.asm
similarity index 100%
rename from gfx/tilesets/sprout_tower_palette_map.asm
rename to gfx/tilesets/tower_palette_map.asm
diff --git a/gfx/tilesets/kurts_house.2bpp.lz.dd51d079 b/gfx/tilesets/traditional_house.2bpp.lz.dd51d079
similarity index 100%
rename from gfx/tilesets/kurts_house.2bpp.lz.dd51d079
rename to gfx/tilesets/traditional_house.2bpp.lz.dd51d079
diff --git a/gfx/tilesets/kurts_house.png b/gfx/tilesets/traditional_house.png
similarity index 100%
rename from gfx/tilesets/kurts_house.png
rename to gfx/tilesets/traditional_house.png
diff --git a/gfx/tilesets/kurts_house_palette_map.asm b/gfx/tilesets/traditional_house_palette_map.asm
similarity index 100%
rename from gfx/tilesets/kurts_house_palette_map.asm
rename to gfx/tilesets/traditional_house_palette_map.asm
diff --git a/home/map.asm b/home/map.asm
index 90f262a23..735d638ad 100644
--- a/home/map.asm
+++ b/home/map.asm
@@ -1431,9 +1431,9 @@ LoadTilesetGFX:: ; 2821
; 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