pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/map_constants.asm
View File

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

6
constants/scene_constants.asm
View File

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

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"

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

2
wram.asm
View File

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