summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-02-25 22:19:17 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-02-25 22:19:17 -0500
commit2f9a0d7d9f3e2ee0f1db0ef25cd47803bc0efdf6 (patch)
tree1c5c751cf261d01013ce1305d44e1dd4f547b628 /data
parent409fd9d33f88b2ad1e1d1f01360c62416a805e1f (diff)
Pokecom Center Admin Room -> Office
Diffstat (limited to 'data')
-rw-r--r--data/maps/attributes.asm2
-rw-r--r--data/maps/blocks.asm4
-rw-r--r--data/maps/maps.asm2
-rw-r--r--data/maps/scripts.asm2
4 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
index 23afc8103..fff261319 100644
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@@ -517,7 +517,7 @@ ENDM
map_attributes GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0
map_attributes GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $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 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0
map_attributes DayCare, DAY_CARE, $00, 0
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
index 6ee73f3e9..c4f180b8f 100644
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -1022,8 +1022,8 @@ BattleTower1F_Blocks:
BattleTowerBattleRoom_Blocks:
INCBIN "maps/BattleTowerBattleRoom.blk"
-PokecomCenterAdminRoomMobile_Blocks:
- INCBIN "maps/PokecomCenterAdminRoomMobile.blk"
+PokecomCenterAdminOfficeMobile_Blocks:
+ INCBIN "maps/PokecomCenterAdminOfficeMobile.blk"
MobileTradeRoom_Blocks:
INCBIN "maps/MobileTradeRoom.blk"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index 471884825..e86cef4c4 100644
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -271,7 +271,7 @@ MapGroup_Goldenrod:
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 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 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
diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm
index 4d314cd1e..ff9974833 100644
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@@ -63,7 +63,7 @@ INCLUDE "maps/RadioTower5F.asm"
INCLUDE "maps/OlivineLighthouse5F.asm"
INCLUDE "maps/OlivineLighthouse6F.asm"
INCLUDE "maps/GoldenrodPokecenter1F.asm"
-INCLUDE "maps/PokecomCenterAdminRoomMobile.asm"
+INCLUDE "maps/PokecomCenterAdminOfficeMobile.asm"
INCLUDE "maps/IlexForestAzaleaGate.asm"
INCLUDE "maps/Route34IlexForestGate.asm"
INCLUDE "maps/DayCare.asm"