diff options
| -rw-r--r-- | constants/map_constants.asm | 2 | ||||
| -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 | ||||
| -rw-r--r-- | maps/EcruteakCity.asm | 4 | ||||
| -rw-r--r-- | maps/EcruteakTinTowerBackEntrance.asm (renamed from maps/WiseTriosRoom.asm) | 4 | ||||
| -rw-r--r-- | maps/EcruteakTinTowerBackEntrance.blk (renamed from maps/WiseTriosRoom.blk) | 0 | ||||
| -rw-r--r-- | maps/EcruteakTinTowerEntrance.asm | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 6c229920..fc033859 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -141,7 +141,7 @@ ENDM newgroup ; 4 map_const ECRUTEAK_TIN_TOWER_ENTRANCE, 10, 9 ; 1 - map_const WISE_TRIOS_ROOM, 4, 4 ; 2 + map_const ECRUTEAK_TIN_TOWER_BACK_ENTRANCE, 4, 4 ; 2 map_const ECRUTEAK_POKECENTER_1F, 5, 4 ; 3 map_const ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 ; 4 map_const DANCE_THEATRE, 6, 7 ; 5 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" diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 25be03ba..e7dc703d 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -230,8 +230,8 @@ EcruteakCity_MapEvents: warp_event 35, 26, ROUTE_42_ECRUTEAK_GATE, 1 warp_event 35, 27, ROUTE_42_ECRUTEAK_GATE, 2 warp_event 18, 11, ECRUTEAK_TIN_TOWER_ENTRANCE, 1 - warp_event 20, 2, WISE_TRIOS_ROOM, 1 - warp_event 20, 3, WISE_TRIOS_ROOM, 2 + warp_event 20, 2, ECRUTEAK_TIN_TOWER_BACK_ENTRANCE, 1 + warp_event 20, 3, ECRUTEAK_TIN_TOWER_BACK_ENTRANCE, 2 warp_event 23, 27, ECRUTEAK_POKECENTER_1F, 1 warp_event 5, 21, ECRUTEAK_LUGIA_SPEECH_HOUSE, 1 warp_event 23, 21, DANCE_THEATRE, 1 diff --git a/maps/WiseTriosRoom.asm b/maps/EcruteakTinTowerBackEntrance.asm index 53f2ec88..57ffcbbc 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/EcruteakTinTowerBackEntrance.asm @@ -1,9 +1,9 @@ -WiseTriosRoom_MapScripts: +EcruteakTinTowerBackEntrance_MapScripts: db 0 ; scene scripts db 0 ; callbacks -WiseTriosRoom_MapEvents: +EcruteakTinTowerBackEntrance_MapEvents: db 0, 0 ; filler db 3 ; warp events diff --git a/maps/WiseTriosRoom.blk b/maps/EcruteakTinTowerBackEntrance.blk index c97f603f..c97f603f 100644 --- a/maps/WiseTriosRoom.blk +++ b/maps/EcruteakTinTowerBackEntrance.blk diff --git a/maps/EcruteakTinTowerEntrance.asm b/maps/EcruteakTinTowerEntrance.asm index 49d99157..88db0b36 100644 --- a/maps/EcruteakTinTowerEntrance.asm +++ b/maps/EcruteakTinTowerEntrance.asm @@ -149,7 +149,7 @@ EcruteakTinTowerEntrance_MapEvents: warp_event 5, 17, ECRUTEAK_CITY, 3 warp_event 5, 3, ECRUTEAK_TIN_TOWER_ENTRANCE, 4 warp_event 17, 15, ECRUTEAK_TIN_TOWER_ENTRANCE, 3 - warp_event 17, 3, WISE_TRIOS_ROOM, 3 + warp_event 17, 3, ECRUTEAK_TIN_TOWER_BACK_ENTRANCE, 3 db 2 ; coord events coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntrance_CoordEvent1 |