From 936a170e0da19cb5bb2ccc325a43a28690230098 Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 31 Jan 2018 23:21:15 -0500 Subject: MobileTradeRoom matches MobileBattleRoom --- maps/MobileTradeRoom.asm | 47 ++++++++++++++++++++++++++++++++++++++++++ maps/MobileTradeRoom.blk | 1 + maps/MobileTradeRoomMobile.asm | 47 ------------------------------------------ maps/MobileTradeRoomMobile.blk | 1 - maps/Pokecenter2F.asm | 4 ++-- 5 files changed, 50 insertions(+), 50 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 (limited to 'maps') 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 -- cgit v1.2.3