Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pokecom Center Admin Room -> Office

This commit is contained in:
Rangi 2018-02-25 22:19:17 -05:00
parent 409fd9d33f
commit 2f9a0d7d9f
8 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/map_constants.asm
View File

@ -260,7 +260,7 @@ ENDM
map_const GOLDENROD_DEPT_STORE_ROOF, 8, 4 ; 18 map_const GOLDENROD_DEPT_STORE_ROOF, 8, 4 ; 18
map_const GOLDENROD_GAME_CORNER, 10, 7 ; 19 map_const GOLDENROD_GAME_CORNER, 10, 7 ; 19
map_const GOLDENROD_POKECENTER_1F, 5, 4 ; 20 map_const GOLDENROD_POKECENTER_1F, 5, 4 ; 20
map_const POKECOM_CENTER_ADMIN_ROOM_MOBILE, 16, 16 ; 21 map_const POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 16, 16 ; 21
map_const ILEX_FOREST_AZALEA_GATE, 5, 4 ; 22 map_const ILEX_FOREST_AZALEA_GATE, 5, 4 ; 22
map_const ROUTE_34_ILEX_FOREST_GATE, 5, 4 ; 23 map_const ROUTE_34_ILEX_FOREST_GATE, 5, 4 ; 23
map_const DAY_CARE, 5, 4 ; 24 map_const DAY_CARE, 5, 4 ; 24

2
data/maps/attributes.asm
View File

@ -517,7 +517,7 @@ ENDM
map_attributes GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0 map_attributes GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0
map_attributes GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0 map_attributes GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0
map_attributes GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0 map_attributes GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0
map_attributes PokecomCenterAdminRoomMobile, POKECOM_CENTER_ADMIN_ROOM_MOBILE, $00, 0 map_attributes PokecomCenterAdminOfficeMobile, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, $00, 0
map_attributes IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0 map_attributes IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0
map_attributes Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0 map_attributes Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0
map_attributes DayCare, DAY_CARE, $00, 0 map_attributes DayCare, DAY_CARE, $00, 0

4
data/maps/blocks.asm
View File

@ -1022,8 +1022,8 @@ BattleTower1F_Blocks:
BattleTowerBattleRoom_Blocks: BattleTowerBattleRoom_Blocks:
INCBIN "maps/BattleTowerBattleRoom.blk" INCBIN "maps/BattleTowerBattleRoom.blk"
PokecomCenterAdminRoomMobile_Blocks: PokecomCenterAdminOfficeMobile_Blocks:
INCBIN "maps/PokecomCenterAdminRoomMobile.blk" INCBIN "maps/PokecomCenterAdminOfficeMobile.blk"
MobileTradeRoom_Blocks: MobileTradeRoom_Blocks:
INCBIN "maps/MobileTradeRoom.blk" INCBIN "maps/MobileTradeRoom.blk"

2
data/maps/maps.asm
View File

@ -271,7 +271,7 @@ MapGroup_Goldenrod:
map GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map PokecomCenterAdminRoomMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PokecomCenterAdminOfficeMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE map DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

2
data/maps/scripts.asm
View File

@ -63,7 +63,7 @@ INCLUDE "maps/RadioTower5F.asm"
INCLUDE "maps/OlivineLighthouse5F.asm" INCLUDE "maps/OlivineLighthouse5F.asm"
INCLUDE "maps/OlivineLighthouse6F.asm" INCLUDE "maps/OlivineLighthouse6F.asm"
INCLUDE "maps/GoldenrodPokecenter1F.asm" INCLUDE "maps/GoldenrodPokecenter1F.asm"
INCLUDE "maps/PokecomCenterAdminRoomMobile.asm" INCLUDE "maps/PokecomCenterAdminOfficeMobile.asm"
INCLUDE "maps/IlexForestAzaleaGate.asm" INCLUDE "maps/IlexForestAzaleaGate.asm"
INCLUDE "maps/Route34IlexForestGate.asm" INCLUDE "maps/Route34IlexForestGate.asm"
INCLUDE "maps/DayCare.asm" INCLUDE "maps/DayCare.asm"

2
maps/GoldenrodPokecenter1F.asm
View File

@ -808,7 +808,7 @@ GoldenrodPokecenter1F_MapEvents:
db 4 ; warp events db 4 ; warp events
warp_event 3, 7, GOLDENROD_CITY, 15 warp_event 3, 7, GOLDENROD_CITY, 15
warp_event 4, 7, GOLDENROD_CITY, 15 warp_event 4, 7, GOLDENROD_CITY, 15
warp_event 0, 6, POKECOM_CENTER_ADMIN_ROOM_MOBILE, 1 warp_event 0, 6, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 1
warp_event 0, 7, POKECENTER_2F, 1 warp_event 0, 7, POKECENTER_2F, 1
db 2 ; coord events db 2 ; coord events

46
maps/PokecomCenterAdminRoomMobile.asm → maps/PokecomCenterAdminOfficeMobile.asm
View File

@ -1,23 +1,23 @@
const_def 2 ; object constants const_def 2 ; object constants
const POKECOMCENTERADMINROOMMOBILE_SCIENTIST1 const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST1
const POKECOMCENTERADMINROOMMOBILE_SCIENTIST2 const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST2
const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3 const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST3
PokecomCenterAdminRoomMobile_MapScripts: PokecomCenterAdminOfficeMobile_MapScripts:
db 0 ; scene scripts db 0 ; scene scripts
db 0 ; callbacks db 0 ; callbacks
PokecomCenterAdminRoomMobileScientist1Script: PokecomCenterAdminOfficeMobileScientist1Script:
jumptextfaceplayer PokecomCenterAdminRoomMobileScientist1Text jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist1Text
PokecomCenterAdminRoomMobileScientist2Script: PokecomCenterAdminOfficeMobileScientist2Script:
jumptextfaceplayer PokecomCenterAdminRoomMobileScientist2Text jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist2Text
PokecomCenterAdminRoomMobileScientist3Script: PokecomCenterAdminOfficeMobileScientist3Script:
jumptextfaceplayer PokecomCenterAdminRoomMobileScientist3Text jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist3Text
PokecomCenterAdminRoomMobileSignpost0Script: PokecomCenterAdminOfficeMobileSignpost0Script:
opentext opentext
writetext UnknownText_0x627ee writetext UnknownText_0x627ee
waitbutton waitbutton
@ -59,7 +59,7 @@ MenuHeader_0x62602:
db "モバイルセンター@" ; MOBILE CENTER db "モバイルセンター@" ; MOBILE CENTER
db "やめる@" ; QUIT db "やめる@" ; QUIT
PokecomCenterAdminRoomMobileSignpost1Script: PokecomCenterAdminOfficeMobileSignpost1Script:
opentext opentext
writetext UnknownText_0x62989 writetext UnknownText_0x62989
waitbutton waitbutton
@ -101,10 +101,10 @@ MenuHeader_0x6264c:
db "でんわ<GA>つながらないとき@" ; Don't use phone db "でんわ<GA>つながらないとき@" ; Don't use phone
db "やめる@" ; QUIT db "やめる@" ; QUIT
PokecomCenterAdminRoomMobileSignpost2Script: PokecomCenterAdminOfficeMobileSignpost2Script:
jumptext UnknownText_0x62b26 jumptext UnknownText_0x62b26
PokecomCenterAdminRoomMobileScientist1Text: PokecomCenterAdminOfficeMobileScientist1Text:
text "#COM CENTER and" text "#COM CENTER and"
line "MOBILE CENTER were" line "MOBILE CENTER were"
@ -118,7 +118,7 @@ PokecomCenterAdminRoomMobileScientist1Text:
line "strangers." line "strangers."
done done
PokecomCenterAdminRoomMobileScientist2Text: PokecomCenterAdminOfficeMobileScientist2Text:
text "When you linked" text "When you linked"
line "with someone by" line "with someone by"
@ -135,7 +135,7 @@ PokecomCenterAdminRoomMobileScientist2Text:
line "got the shakes!" line "got the shakes!"
done done
PokecomCenterAdminRoomMobileScientist3Text: PokecomCenterAdminOfficeMobileScientist3Text:
text "They were able to" text "They were able to"
line "build this huge" line "build this huge"
@ -260,7 +260,7 @@ UnknownText_0x62b26:
para "<……> <……> <……>" para "<……> <……> <……>"
done done
PokecomCenterAdminRoomMobile_MapEvents: PokecomCenterAdminOfficeMobile_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
db 2 ; warp events db 2 ; warp events
@ -270,11 +270,11 @@ PokecomCenterAdminRoomMobile_MapEvents:
db 0 ; coord events db 0 ; coord events
db 3 ; bg events db 3 ; bg events
bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost0Script
bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost1Script
bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost2Script
db 3 ; object events db 3 ; object events
object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1 object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist1Script, -1
object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1 object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist2Script, -1
object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1 object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist3Script, -1

0
maps/PokecomCenterAdminRoomMobile.blk → maps/PokecomCenterAdminOfficeMobile.blk
View File