summaryrefslogtreecommitdiff
path: root/constants/tilemap_constants.asm
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2019-10-11 02:21:44 -0600
committerIIMarckus <iimarckus@gmail.com>2019-10-11 02:21:44 -0600
commitd64251740efc16342023340921d0e9161173df48 (patch)
treeab5a74cae1ab160d13d370c166b4c2a15889a76a /constants/tilemap_constants.asm
parente7b5c8495d90a54c31b84bd3db6319f9734ddd27 (diff)
Sync tileset IDs with pokecrystal.
Diffstat (limited to 'constants/tilemap_constants.asm')
-rw-r--r--constants/tilemap_constants.asm28
1 files changed, 14 insertions, 14 deletions
diff --git a/constants/tilemap_constants.asm b/constants/tilemap_constants.asm
index b1185bf2..5fe2beb9 100644
--- a/constants/tilemap_constants.asm
+++ b/constants/tilemap_constants.asm
@@ -5,35 +5,35 @@ WATRTILE EQU 15
TALK EQU 1 << 4
const_value SET 1
- const TILESET_JOHTO_1 ; 01
- const TILESET_JOHTO_2 ; 02
+ const_def 1
+ const TILESET_JOHTO ; 01
+ const TILESET_JOHTO_MODERN ; 02
const TILESET_KANTO ; 03
- const TILESET_HOUSE_1 ; 04
- const TILESET_KRISS_HOUSE ; 05
+ const TILESET_HOUSE ; 04
+ const TILESET_PLAYERS_HOUSE ; 05
const TILESET_POKECENTER ; 06
const TILESET_GATE ; 07
const TILESET_PORT ; 08
const TILESET_LAB ; 09
- const TILESET_POWER_PLANT ; 0a
+ const TILESET_FACILITY ; 0a
const TILESET_MART ; 0b
- const TILESET_CELADON_MANSION ; 0c
+ const TILESET_MANSION ; 0c
const TILESET_GAME_CORNER ; 0d
- const TILESET_GYM_1 ; 0e
- const TILESET_KURT_HOUSE ; 0f
+ const TILESET_ELITE_FOUR_ROOM ; 0e
+ const TILESET_TRADITIONAL_HOUSE ; 0f
const TILESET_TRAIN_STATION ; 10
- const TILESET_OLIVINE_GYM ; 11
+ const TILESET_CHAMPIONS_ROOM ; 11
const TILESET_LIGHTHOUSE ; 12
- const TILESET_KRISS_HOUSE_2F ; 13
- const TILESET_SPROUT_TOWER ; 14
+ const TILESET_PLAYERS_ROOM ; 13
+ const TILESET_TOWER ; 14
const TILESET_CAVE ; 15
const TILESET_PARK ; 16
const TILESET_RUINS_OF_ALPH ; 17
const TILESET_RADIO_TOWER ; 18
const TILESET_UNDERGROUND ; 19
const TILESET_ICE_PATH ; 1a
- const TILESET_WHIRL_ISLANDS ; 1b
- const TILESET_ILEX_FOREST ; 1c
- const TILESET_29 ; 1d
+ const TILESET_DARK_CAVE ; 1b
+ const TILESET_FOREST ; 1c
const_def
const PAL_BG_GRAY