diff options
| -rw-r--r-- | constants/tilemap_constants.asm | 28 | ||||
| -rwxr-xr-x | engine/events/overworld.asm | 8 |
2 files changed, 18 insertions, 18 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 diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 82981450..f12aad03 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -244,11 +244,11 @@ CheckOverworldTileArrays: ; c87c (3:487c) ret CutTreeBlockPointers: - dbw TILESET_JOHTO_1, .johto1 - dbw TILESET_JOHTO_2, .johto2 + dbw TILESET_JOHTO, .johto1 + dbw TILESET_JOHTO_MODERN, .johto2 dbw TILESET_KANTO, .kanto dbw TILESET_PARK, .park - dbw TILESET_ILEX_FOREST, .ilex + dbw TILESET_FOREST, .ilex db -1 .johto1 @@ -282,7 +282,7 @@ CutTreeBlockPointers: db -1 WhirlpoolBlockPointers: - dbw TILESET_JOHTO_1, .johto + dbw TILESET_JOHTO, .johto db -1 .johto |