Skip to content

Commit 2f9a0d7

Browse files
Rangi42Rangi42
committed
Pokecom Center Admin Room -> Office
1 parent 409fd9d commit 2f9a0d7

8 files changed

+30
-30
lines changed

‎constants/map_constants.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ ENDM
260260
map_const GOLDENROD_DEPT_STORE_ROOF, 8, 4 ; 18
261261
map_const GOLDENROD_GAME_CORNER, 10, 7 ; 19
262262
map_const GOLDENROD_POKECENTER_1F, 5, 4 ; 20
263-
map_const POKECOM_CENTER_ADMIN_ROOM_MOBILE, 16, 16 ; 21
263+
map_const POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 16, 16 ; 21
264264
map_const ILEX_FOREST_AZALEA_GATE, 5, 4 ; 22
265265
map_const ROUTE_34_ILEX_FOREST_GATE, 5, 4 ; 23
266266
map_const DAY_CARE, 5, 4 ; 24

‎data/maps/attributes.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ ENDM
517517
map_attributes GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0
518518
map_attributes GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0
519519
map_attributes GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0
520-
map_attributes PokecomCenterAdminRoomMobile, POKECOM_CENTER_ADMIN_ROOM_MOBILE, $00, 0
520+
map_attributes PokecomCenterAdminOfficeMobile, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, $00, 0
521521
map_attributes IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0
522522
map_attributes Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0
523523
map_attributes DayCare, DAY_CARE, $00, 0

‎data/maps/blocks.asm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1022,8 +1022,8 @@ BattleTower1F_Blocks:
10221022
BattleTowerBattleRoom_Blocks:
10231023
INCBIN "maps/BattleTowerBattleRoom.blk"
10241024

1025-
PokecomCenterAdminRoomMobile_Blocks:
1026-
INCBIN "maps/PokecomCenterAdminRoomMobile.blk"
1025+
PokecomCenterAdminOfficeMobile_Blocks:
1026+
INCBIN "maps/PokecomCenterAdminOfficeMobile.blk"
10271027

10281028
MobileTradeRoom_Blocks:
10291029
INCBIN "maps/MobileTradeRoom.blk"

‎data/maps/maps.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ MapGroup_Goldenrod:
271271
map GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
272272
map GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
273273
map GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
274-
map PokecomCenterAdminRoomMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
274+
map PokecomCenterAdminOfficeMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
275275
map IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
276276
map Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
277277
map DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

‎data/maps/scripts.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ INCLUDE "maps/RadioTower5F.asm"
6363
INCLUDE "maps/OlivineLighthouse5F.asm"
6464
INCLUDE "maps/OlivineLighthouse6F.asm"
6565
INCLUDE "maps/GoldenrodPokecenter1F.asm"
66-
INCLUDE "maps/PokecomCenterAdminRoomMobile.asm"
66+
INCLUDE "maps/PokecomCenterAdminOfficeMobile.asm"
6767
INCLUDE "maps/IlexForestAzaleaGate.asm"
6868
INCLUDE "maps/Route34IlexForestGate.asm"
6969
INCLUDE "maps/DayCare.asm"

‎maps/GoldenrodPokecenter1F.asm

+1-1
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ GoldenrodPokecenter1F_MapEvents:
808808
db 4 ; warp events
809809
warp_event 3, 7, GOLDENROD_CITY, 15
810810
warp_event 4, 7, GOLDENROD_CITY, 15
811-
warp_event 0, 6, POKECOM_CENTER_ADMIN_ROOM_MOBILE, 1
811+
warp_event 0, 6, POKECOM_CENTER_ADMIN_OFFICE_MOBILE, 1
812812
warp_event 0, 7, POKECENTER_2F, 1
813813

814814
db 2 ; coord events

‎maps/PokecomCenterAdminRoomMobile.asm ‎maps/PokecomCenterAdminOfficeMobile.asm

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
const_def 2 ; object constants
2-
const POKECOMCENTERADMINROOMMOBILE_SCIENTIST1
3-
const POKECOMCENTERADMINROOMMOBILE_SCIENTIST2
4-
const POKECOMCENTERADMINROOMMOBILE_SCIENTIST3
2+
const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST1
3+
const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST2
4+
const POKECOMCENTERADMINOFFICEMOBILE_SCIENTIST3
55

6-
PokecomCenterAdminRoomMobile_MapScripts:
6+
PokecomCenterAdminOfficeMobile_MapScripts:
77
db 0 ; scene scripts
88

99
db 0 ; callbacks
1010

11-
PokecomCenterAdminRoomMobileScientist1Script:
12-
jumptextfaceplayer PokecomCenterAdminRoomMobileScientist1Text
11+
PokecomCenterAdminOfficeMobileScientist1Script:
12+
jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist1Text
1313

14-
PokecomCenterAdminRoomMobileScientist2Script:
15-
jumptextfaceplayer PokecomCenterAdminRoomMobileScientist2Text
14+
PokecomCenterAdminOfficeMobileScientist2Script:
15+
jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist2Text
1616

17-
PokecomCenterAdminRoomMobileScientist3Script:
18-
jumptextfaceplayer PokecomCenterAdminRoomMobileScientist3Text
17+
PokecomCenterAdminOfficeMobileScientist3Script:
18+
jumptextfaceplayer PokecomCenterAdminOfficeMobileScientist3Text
1919

20-
PokecomCenterAdminRoomMobileSignpost0Script:
20+
PokecomCenterAdminOfficeMobileSignpost0Script:
2121
opentext
2222
writetext UnknownText_0x627ee
2323
waitbutton
@@ -59,7 +59,7 @@ MenuHeader_0x62602:
5959
db "モバイルセンター@" ; MOBILE CENTER
6060
db "やめる@" ; QUIT
6161

62-
PokecomCenterAdminRoomMobileSignpost1Script:
62+
PokecomCenterAdminOfficeMobileSignpost1Script:
6363
opentext
6464
writetext UnknownText_0x62989
6565
waitbutton
@@ -101,10 +101,10 @@ MenuHeader_0x6264c:
101101
db "でんわ<GA>つながらないとき@" ; Don't use phone
102102
db "やめる@" ; QUIT
103103

104-
PokecomCenterAdminRoomMobileSignpost2Script:
104+
PokecomCenterAdminOfficeMobileSignpost2Script:
105105
jumptext UnknownText_0x62b26
106106

107-
PokecomCenterAdminRoomMobileScientist1Text:
107+
PokecomCenterAdminOfficeMobileScientist1Text:
108108
text "#COM CENTER and"
109109
line "MOBILE CENTER were"
110110

@@ -118,7 +118,7 @@ PokecomCenterAdminRoomMobileScientist1Text:
118118
line "strangers."
119119
done
120120

121-
PokecomCenterAdminRoomMobileScientist2Text:
121+
PokecomCenterAdminOfficeMobileScientist2Text:
122122
text "When you linked"
123123
line "with someone by"
124124

@@ -135,7 +135,7 @@ PokecomCenterAdminRoomMobileScientist2Text:
135135
line "got the shakes!"
136136
done
137137

138-
PokecomCenterAdminRoomMobileScientist3Text:
138+
PokecomCenterAdminOfficeMobileScientist3Text:
139139
text "They were able to"
140140
line "build this huge"
141141

@@ -260,7 +260,7 @@ UnknownText_0x62b26:
260260
para "<……> <……> <……>"
261261
done
262262

263-
PokecomCenterAdminRoomMobile_MapEvents:
263+
PokecomCenterAdminOfficeMobile_MapEvents:
264264
db 0, 0 ; filler
265265

266266
db 2 ; warp events
@@ -270,11 +270,11 @@ PokecomCenterAdminRoomMobile_MapEvents:
270270
db 0 ; coord events
271271

272272
db 3 ; bg events
273-
bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost0Script
274-
bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost1Script
275-
bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminRoomMobileSignpost2Script
273+
bg_event 6, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost0Script
274+
bg_event 6, 28, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost1Script
275+
bg_event 3, 26, BGEVENT_UP, PokecomCenterAdminOfficeMobileSignpost2Script
276276

277277
db 3 ; object events
278-
object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist1Script, -1
279-
object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist2Script, -1
280-
object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminRoomMobileScientist3Script, -1
278+
object_event 4, 28, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist1Script, -1
279+
object_event 7, 27, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist2Script, -1
280+
object_event 7, 29, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, PokecomCenterAdminOfficeMobileScientist3Script, -1

‎maps/PokecomCenterAdminRoomMobile.blk ‎maps/PokecomCenterAdminOfficeMobile.blk

File renamed without changes.

0 commit comments

Comments
 (0)