From 936a170e0da19cb5bb2ccc325a43a28690230098 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 31 Jan 2018 23:21:15 -0500 Subject: MobileTradeRoom matches MobileBattleRoom --- constants/map_constants.asm | 2 +- constants/scene_constants.asm | 6 +++--- data/maps/blocks.asm | 4 ++-- data/maps/data.asm | 2 +- data/maps/definitions.asm | 2 +- data/maps/scenes.asm | 2 +- data/maps/scripts.asm | 2 +- maps/MobileTradeRoom.asm | 47 ++++++++++++++++++++++++++++++++++++++++++ maps/MobileTradeRoom.blk | 1 + maps/MobileTradeRoomMobile.asm | 47 ------------------------------------------ maps/MobileTradeRoomMobile.blk | 1 - maps/Pokecenter2F.asm | 4 ++-- wram.asm | 2 +- 13 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 maps/MobileTradeRoom.asm create mode 100644 maps/MobileTradeRoom.blk delete mode 100644 maps/MobileTradeRoomMobile.asm delete mode 100644 maps/MobileTradeRoomMobile.blk diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 4407bdd7f..c1f7c3b70 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -373,7 +373,7 @@ ENDM mapconst TRADE_CENTER, 4, 5 ; 2 mapconst COLOSSEUM, 4, 5 ; 3 mapconst TIME_CAPSULE, 4, 5 ; 4 - mapconst MOBILE_TRADE_ROOM_MOBILE, 4, 5 ; 5 + mapconst MOBILE_TRADE_ROOM, 4, 5 ; 5 mapconst MOBILE_BATTLE_ROOM, 4, 5 ; 6 newgroup ; 21 diff --git a/constants/scene_constants.asm b/constants/scene_constants.asm index 1b1e80d28..d087703fa 100644 --- a/constants/scene_constants.asm +++ b/constants/scene_constants.asm @@ -377,10 +377,10 @@ const SCENE_MOUNTMOONSQUARE_0 const SCENE_MOUNTMOONSQUARE_1 -; wMobileTradeRoomMobileSceneID +; wMobileTradeRoomSceneID const_def - const SCENE_MOBILETRADEROOMMOBILE_0 - const SCENE_MOBILETRADEROOMMOBILE_1 + const SCENE_MOBILETRADEROOM_0 + const SCENE_MOBILETRADEROOM_1 ; wMobileBattleRoomSceneID const_def 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" diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm new file mode 100644 index 000000000..73e40ef82 --- /dev/null +++ b/maps/MobileTradeRoom.asm @@ -0,0 +1,47 @@ +MobileTradeRoom_MapScripts: + db 2 ; scene scripts + scene_script .InitializeMobileTradeRoom ; SCENE_MOBILETRADEROOM_0 + scene_script .DummyScene ; SCENE_MOBILETRADEROOM_1 + + db 0 ; callbacks + +.InitializeMobileTradeRoom: + priorityjump .InitializeAndPreparePokecenter2F + end + +.DummyScene: + end + +.InitializeAndPreparePokecenter2F: + setscene SCENE_MOBILETRADEROOM_1 + setmapscene POKECENTER_2F, SCENE_POKECENTER2F_4 + end + +MapMobileTradeRoomSignpost0Script: + refreshscreen + special Function1037c2 + writetext MobileTradeRoom_EstablishingCommsText + waitbutton + reloadmappart + special Function101231 + closetext + end + +MobileTradeRoom_EstablishingCommsText: + text "Establishing" + line "communications…" + done + +MobileTradeRoom_MapEvents: + db 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 7, 5, POKECENTER_2F + warp_event 5, 7, 5, POKECENTER_2F + + db 0 ; coord events + + db 1 ; bg events + bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomSignpost0Script + + db 0 ; object events diff --git a/maps/MobileTradeRoom.blk b/maps/MobileTradeRoom.blk new file mode 100644 index 000000000..fbe578781 --- /dev/null +++ b/maps/MobileTradeRoom.blk @@ -0,0 +1 @@ +/1230=567>9<.;:=?-> \ No newline at end of file diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm deleted file mode 100644 index e5be1a979..000000000 --- a/maps/MobileTradeRoomMobile.asm +++ /dev/null @@ -1,47 +0,0 @@ -MobileTradeRoomMobile_MapScripts: - db 2 ; scene scripts - scene_script .InitializeMobileTradeRoomMobile ; SCENE_MOBILETRADEROOMMOBILE_0 - scene_script .DummyScene ; SCENE_MOBILETRADEROOMMOBILE_1 - - db 0 ; callbacks - -.InitializeMobileTradeRoomMobile: - priorityjump .InitializeAndPreparePokecenter2F - end - -.DummyScene: - end - -.InitializeAndPreparePokecenter2F: - setscene SCENE_MOBILETRADEROOMMOBILE_1 - setmapscene POKECENTER_2F, SCENE_POKECENTER2F_4 - end - -MapMobileTradeRoomMobileSignpost0Script: - refreshscreen - special Function1037c2 - writetext MobileTradeRoomMobile_EstablishingCommsText - waitbutton - reloadmappart - special Function101231 - closetext - end - -MobileTradeRoomMobile_EstablishingCommsText: - text "Establishing" - line "communications…" - done - -MobileTradeRoomMobile_MapEvents: - db 0, 0 ; filler - - db 2 ; warp events - warp_event 4, 7, 5, POKECENTER_2F - warp_event 5, 7, 5, POKECENTER_2F - - db 0 ; coord events - - db 1 ; bg events - bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomMobileSignpost0Script - - db 0 ; object events diff --git a/maps/MobileTradeRoomMobile.blk b/maps/MobileTradeRoomMobile.blk deleted file mode 100644 index fbe578781..000000000 --- a/maps/MobileTradeRoomMobile.blk +++ /dev/null @@ -1 +0,0 @@ -/1230=567>9<.;:=?-> \ No newline at end of file diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm index 7bdc6e670..204ef2556 100644 --- a/maps/Pokecenter2F.asm +++ b/maps/Pokecenter2F.asm @@ -382,7 +382,7 @@ Script_LeftMobileTradeRoom: special Function101220 scall Script_WalkOutOfMobileTradeRoom setscene SCENE_POKECENTER2F_0 - setmapscene MOBILE_TRADE_ROOM_MOBILE, SCENE_MOBILETRADEROOMMOBILE_0 + setmapscene MOBILE_TRADE_ROOM, SCENE_MOBILETRADEROOM_0 end Script_WalkOutOfMobileTradeRoom: @@ -1028,7 +1028,7 @@ Pokecenter2F_MapEvents: warp_event 5, 0, 1, TRADE_CENTER warp_event 9, 0, 1, COLOSSEUM warp_event 13, 2, 1, TIME_CAPSULE - warp_event 6, 0, 1, MOBILE_TRADE_ROOM_MOBILE + warp_event 6, 0, 1, MOBILE_TRADE_ROOM warp_event 10, 0, 1, MOBILE_BATTLE_ROOM db 0 ; coord events diff --git a/wram.asm b/wram.asm index c507c2495..8e249f908 100644 --- a/wram.asm +++ b/wram.asm @@ -2577,7 +2577,7 @@ wVermilionPortSceneID:: db ; d9bb wFastShip1FSceneID:: db ; d9bc wFastShipB1FSceneID:: db ; d9bd wMountMoonSquareSceneID:: db ; d9be -wMobileTradeRoomMobileSceneID:: db ; d9bf +wMobileTradeRoomSceneID:: db ; d9bf wMobileBattleRoomSceneID:: db ; d9c0 ds 49 -- cgit v1.2.3