diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 17:32:11 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 17:32:11 -0400 |
| commit | 03e93e5a702448f4ffd0065b5f0f92bc2c89ba4b (patch) | |
| tree | e45eeedbb6ea3d7c0725e7a1188e7b2c3ec027a1 /data | |
| parent | 42c5aab5e3a63c1928806dd33df0680b0f273931 (diff) | |
WiseTriosRoom -> EcruteakTinTowerBackEntrance
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/attributes.asm | 2 | ||||
| -rw-r--r-- | data/maps/blocks.asm | 4 | ||||
| -rw-r--r-- | data/maps/maps.asm | 2 | ||||
| -rw-r--r-- | data/maps/scripts.asm | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index d16b1c61..5f5f2f1c 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -473,7 +473,7 @@ ENDM map_attributes SafariZoneBeta, SAFARI_ZONE_BETA, $13, 0 map_attributes VictoryRoad, VICTORY_ROAD, $1d, 0 map_attributes EcruteakTinTowerEntrance, ECRUTEAK_TIN_TOWER_ENTRANCE, $00, 0 - map_attributes WiseTriosRoom, WISE_TRIOS_ROOM, $00, 0 + map_attributes EcruteakTinTowerBackEntrance, ECRUTEAK_TIN_TOWER_BACK_ENTRANCE, $00, 0 map_attributes EcruteakPokecenter1F, ECRUTEAK_POKECENTER_1F, $00, 0 map_attributes EcruteakLugiaSpeechHouse, ECRUTEAK_LUGIA_SPEECH_HOUSE, $00, 0 map_attributes DanceTheatre, DANCE_THEATRE, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index e93719de..94c8ff86 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -983,8 +983,8 @@ GoldenrodFlowerShop_Blocks: MountMoonSquare_Blocks: INCBIN "maps/MountMoonSquare.blk" -WiseTriosRoom_Blocks: - INCBIN "maps/WiseTriosRoom.blk" +EcruteakTinTowerBackEntrance_Blocks: + INCBIN "maps/EcruteakTinTowerBackEntrance.blk" DragonsDen1F_Blocks: INCBIN "maps/DragonsDen1F.blk" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 46155310..c32071bb 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -154,7 +154,7 @@ MapGroup_Dungeons: MapGroup_Ecruteak: map EcruteakTinTowerEntrance, TILESET_TOWER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map WiseTriosRoom, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE + map EcruteakTinTowerBackEntrance, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map EcruteakLugiaSpeechHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map DanceTheatre, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_DANCING_HALL, FALSE, PALETTE_DAY, FISHGROUP_SHORE diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 54c71ab9..63ce2551 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -231,7 +231,7 @@ INCLUDE "maps/Route42EcruteakGate.asm" SECTION "Map Scripts 17", ROMX INCLUDE "maps/EcruteakTinTowerEntrance.asm" -INCLUDE "maps/WiseTriosRoom.asm" +INCLUDE "maps/EcruteakTinTowerBackEntrance.asm" INCLUDE "maps/EcruteakPokecenter1F.asm" INCLUDE "maps/EcruteakLugiaSpeechHouse.asm" INCLUDE "maps/DanceTheatre.asm" |