summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-17 14:50:34 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-17 14:50:34 -0500
commitb1c808f9f85c215340daccf7dc8eaa3832f15ba6 (patch)
treefc5b691a5b0bc3c0383faacf13690226ac399e9a /constants
parentd2725c31040af3d54ea9b0f28f8fe89d6454e75b (diff)
Rename some tilesets (close #467)
Diffstat (limited to 'constants')
-rw-r--r--constants/tileset_constants.asm24
1 files changed, 12 insertions, 12 deletions
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