diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-31 23:21:15 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-31 23:21:15 -0500 |
| commit | 936a170e0da19cb5bb2ccc325a43a28690230098 (patch) | |
| tree | a2357dc4b453b57ae7e3f32f56e72170ac998153 /data | |
| parent | a17623d96b25d6733846f5774fd10bb317862b43 (diff) | |
MobileTradeRoom matches MobileBattleRoom
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 dbfa49b5a..6ee73f3e9 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1025,8 +1025,8 @@ BattleTowerBattleRoom_Blocks: PokecomCenterAdminRoomMobile_Blocks: INCBIN "maps/PokecomCenterAdminRoomMobile.blk" -MobileTradeRoomMobile_Blocks: - INCBIN "maps/MobileTradeRoomMobile.blk" +MobileTradeRoom_Blocks: + INCBIN "maps/MobileTradeRoom.blk" MobileBattleRoom_Blocks: INCBIN "maps/MobileBattleRoom.blk" diff --git a/data/maps/data.asm b/data/maps/data.asm index 2bd2fc553..2dfcfdbf9 100644 --- a/data/maps/data.asm +++ b/data/maps/data.asm @@ -584,7 +584,7 @@ ENDM map_data TradeCenter, TRADE_CENTER, $00, 0 map_data Colosseum, COLOSSEUM, $00, 0 map_data TimeCapsule, TIME_CAPSULE, $00, 0 - map_data MobileTradeRoomMobile, MOBILE_TRADE_ROOM_MOBILE, $00, 0 + map_data MobileTradeRoom, MOBILE_TRADE_ROOM, $00, 0 map_data MobileBattleRoom, MOBILE_BATTLE_ROOM, $00, 0 map_data CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $00, 0 map_data CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $00, 0 diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm index 6772ecc97..b9d13e00c 100644 --- a/data/maps/definitions.asm +++ b/data/maps/definitions.asm @@ -375,7 +375,7 @@ MapGroup_CableClub: map_def TradeCenter, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map_def Colosseum, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map_def TimeCapsule, TILESET_GATE, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map_def MobileTradeRoomMobile, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map_def MobileTradeRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE map_def MobileBattleRoom, TILESET_MANSION, INDOOR, SPECIAL_MAP, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE MapGroup_Celadon: diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index c5be2e819..0971208f1 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -83,7 +83,7 @@ MapScenes:: ; 4d01e scene_def FAST_SHIP_1F, wFastShip1FSceneID scene_def FAST_SHIP_B1F, wFastShipB1FSceneID scene_def MOUNT_MOON_SQUARE, wMountMoonSquareSceneID - scene_def MOBILE_TRADE_ROOM_MOBILE, wMobileTradeRoomMobileSceneID + scene_def MOBILE_TRADE_ROOM, wMobileTradeRoomSceneID scene_def MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID db -1 ; 4d15b diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 331418d6c..4d314cd1e 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -343,7 +343,7 @@ INCLUDE "maps/Pokecenter2F.asm" INCLUDE "maps/TradeCenter.asm" INCLUDE "maps/Colosseum.asm" INCLUDE "maps/TimeCapsule.asm" -INCLUDE "maps/MobileTradeRoomMobile.asm" +INCLUDE "maps/MobileTradeRoom.asm" INCLUDE "maps/MobileBattleRoom.asm" |