pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues 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

20
maps/MobileTradeRoomMobile.asm → maps/MobileTradeRoom.asm
View File

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

0
maps/MobileTradeRoomMobile.blk → maps/MobileTradeRoom.blk
View File

4
maps/Pokecenter2F.asm
View File

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