diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-23 00:30:07 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-23 00:30:07 -0500 |
| commit | 14cb5a3cb097d808e839d677d54a66f176b2e0b7 (patch) | |
| tree | 558f04eecf8914a160ab62d972e63d482f867d01 /data | |
| parent | 689de5e3795ba47e3b0991a7a1baff551245bf52 (diff) | |
EcruteakHouse → EcruteakTinTowerEntrance
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/blocks.asm | 4 | ||||
| -rw-r--r-- | data/maps/data.asm | 2 | ||||
| -rw-r--r-- | data/maps/definitions.asm | 2 | ||||
| -rw-r--r-- | data/maps/scenes.asm | 2 | ||||
| -rw-r--r-- | data/maps/scripts.asm | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index aa5fb9ae9..764ab0a70 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -806,8 +806,8 @@ GoldenrodBikeShop_Blocks: DanceTheatre_Blocks: INCBIN "maps/DanceTheatre.blk" -EcruteakHouse_Blocks: - INCBIN "maps/EcruteakHouse.blk" +EcruteakTinTowerEntrance_Blocks: + INCBIN "maps/EcruteakTinTowerEntrance.blk" GoldenrodGameCorner_Blocks: INCBIN "maps/GoldenrodGameCorner.blk" diff --git a/data/maps/data.asm b/data/maps/data.asm index 6257f4051..b0c7ba02b 100644 --- a/data/maps/data.asm +++ b/data/maps/data.asm @@ -470,7 +470,7 @@ ENDM map_data SafariZoneFuchsiaGateBeta, SAFARI_ZONE_FUCHSIA_GATE_BETA, $00, 0 map_data SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0 map_data VictoryRoad, VICTORY_ROAD, $1d, 0 - map_data EcruteakHouse, ECRUTEAK_HOUSE, $00, 0 + map_data EcruteakTinTowerEntrance, ECRUTEAK_TIN_TOWER_ENTRANCE, $00, 0 map_data WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0 map_data EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0 map_data EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm index 797d2ffee..25b7246bc 100644 --- a/data/maps/definitions.asm +++ b/data/maps/definitions.asm @@ -163,7 +163,7 @@ MapGroup_Dungeons: map_def VictoryRoad, TILESET_CAVE, CAVE, VICTORY_ROAD, MUSIC_VICTORY_ROAD, TRUE, PALETTE_NITE, FISHGROUP_SHORE MapGroup_Ecruteak: - map_def EcruteakHouse, TILESET_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map_def EcruteakTinTowerEntrance, 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_TRADITIONAL_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index 46358f284..89ec3ad31 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -43,7 +43,7 @@ MapScenes:: ; 4d01e scene_def OLIVINE_CITY, wOlivineCitySceneID scene_def ROUTE_34, wRoute34SceneID scene_def ROUTE_34_ILEX_FOREST_GATE, wRoute34IlexForestGateSceneID - scene_def ECRUTEAK_HOUSE, wEcruteakHouseSceneID + scene_def ECRUTEAK_TIN_TOWER_ENTRANCE, wEcruteakTinTowerEntranceSceneID scene_def WISE_TRIOS_ROOM, wWiseTriosRoomSceneID scene_def ECRUTEAK_POKECENTER_1F, wEcruteakPokecenter1FSceneID scene_def ECRUTEAK_GYM, wEcruteakGymSceneID diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 94be9db35..e7631dcaf 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -191,7 +191,7 @@ INCLUDE "maps/Route12SuperRodHouse.asm" SECTION "Map Scripts 11", ROMX -INCLUDE "maps/EcruteakHouse.asm" +INCLUDE "maps/EcruteakTinTowerEntrance.asm" INCLUDE "maps/WiseTriosRoom.asm" INCLUDE "maps/EcruteakPokecenter1F.asm" INCLUDE "maps/EcruteakLugiaSpeechHouse.asm" |