Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MobileTradeRoom matches MobileBattleRoom

Browse Source
This commit is contained in:
Rangi
2018-01-31 23:21:15 -05:00
parent a17623d96b
commit 936a170e0d
11 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/maps/blocks.asm
View File

@@ -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"

2
data/maps/data.asm
View File

@@ -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

2
data/maps/definitions.asm
View File

@@ -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:

2
data/maps/scenes.asm
View File

@@ -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

2
data/maps/scripts.asm
View File

@@ -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"