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 /maps | |
| parent | a17623d96b25d6733846f5774fd10bb317862b43 (diff) | |
MobileTradeRoom matches MobileBattleRoom
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/MobileTradeRoom.asm (renamed from maps/MobileTradeRoomMobile.asm) | 20 | ||||
| -rw-r--r-- | maps/MobileTradeRoom.blk (renamed from maps/MobileTradeRoomMobile.blk) | 0 | ||||
| -rw-r--r-- | maps/Pokecenter2F.asm | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoom.asm index e5be1a979..73e40ef82 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoom.asm @@ -1,11 +1,11 @@ -MobileTradeRoomMobile_MapScripts: +MobileTradeRoom_MapScripts: db 2 ; scene scripts - scene_script .InitializeMobileTradeRoomMobile ; SCENE_MOBILETRADEROOMMOBILE_0 - scene_script .DummyScene ; SCENE_MOBILETRADEROOMMOBILE_1 + scene_script .InitializeMobileTradeRoom ; SCENE_MOBILETRADEROOM_0 + scene_script .DummyScene ; SCENE_MOBILETRADEROOM_1 db 0 ; callbacks -.InitializeMobileTradeRoomMobile: +.InitializeMobileTradeRoom: priorityjump .InitializeAndPreparePokecenter2F end @@ -13,26 +13,26 @@ MobileTradeRoomMobile_MapScripts: end .InitializeAndPreparePokecenter2F: - setscene SCENE_MOBILETRADEROOMMOBILE_1 + setscene SCENE_MOBILETRADEROOM_1 setmapscene POKECENTER_2F, SCENE_POKECENTER2F_4 end -MapMobileTradeRoomMobileSignpost0Script: +MapMobileTradeRoomSignpost0Script: refreshscreen special Function1037c2 - writetext MobileTradeRoomMobile_EstablishingCommsText + writetext MobileTradeRoom_EstablishingCommsText waitbutton reloadmappart special Function101231 closetext end -MobileTradeRoomMobile_EstablishingCommsText: +MobileTradeRoom_EstablishingCommsText: text "Establishing" line "communications…" done -MobileTradeRoomMobile_MapEvents: +MobileTradeRoom_MapEvents: db 0, 0 ; filler db 2 ; warp events @@ -42,6 +42,6 @@ MobileTradeRoomMobile_MapEvents: db 0 ; coord events db 1 ; bg events - bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomMobileSignpost0Script + bg_event 4, 2, BGEVENT_UP, MapMobileTradeRoomSignpost0Script db 0 ; object events diff --git a/maps/MobileTradeRoomMobile.blk b/maps/MobileTradeRoom.blk index fbe578781..fbe578781 100644 --- a/maps/MobileTradeRoomMobile.blk +++ b/maps/MobileTradeRoom.blk 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 |