Rename some tilesets (close #467)

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

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:

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