Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename some more maps

Browse Source 
The Pokécom Center's .blk contains 1F and the Administration room, but the .asm script is just for the Admin room; 1F-related text and scripts are in GoldenrodPokecenter1F.asm. Presumably both map scripts shared the same .blk.
This commit is contained in:
Rangi
2018-01-23 01:03:47 -05:00
parent 14cb5a3cb0
commit fc61d58dc4
15 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/maps/blocks.asm
View File

@@ -165,7 +165,7 @@ CharcoalKiln_Blocks:
LakeOfRageHiddenPowerHouse_Blocks:
LakeOfRageMagikarpHouse_Blocks:
GoldenrodHappinessRater_Blocks:
GoldenrodBillsHouse_Blocks:
BillsFamilysHouse_Blocks:
GoldenrodPPSpeechHouse_Blocks:
GoldenrodNameRater_Blocks:
VermilionFishingSpeechHouse_Blocks:
@@ -174,7 +174,7 @@ VermilionDiglettsCaveSpeechHouse_Blocks:
BluesHouse_Blocks:
PewterNidoranSpeechHouse_Blocks:
PewterSnoozeSpeechHouse_Blocks:
FuchsiaBillSpeechHouse_Blocks:
BillsBrothersHouse_Blocks:
LavenderSpeechHouse_Blocks:
LavenderNameRater_Blocks:
Route12SuperRodHouse_Blocks:
@@ -190,7 +190,7 @@ ViridianNicknameSpeechHouse_Blocks:
Route2NuggetSpeechHouse_Blocks:
PlayersNeighborsHouse_Blocks:
Route26HealSpeechHouse_Blocks:
Route26DayofWeekSiblingsHouse_Blocks:
DayOfWeekSiblingsHouse_Blocks:
Route27SandstormHouse_Blocks:
MrPsychicsHouse_Blocks:
Route5CleanseTagSpeechHouse_Blocks:
@@ -1022,8 +1022,8 @@ BattleTower1F_Blocks:
BattleTowerBattleRoom_Blocks:
INCBIN "maps/BattleTowerBattleRoom.blk"
GoldenrodPokeComCenter2FMobile_Blocks:
INCBIN "maps/GoldenrodPokeComCenter2FMobile.blk"
PokecomCenterAdminRoomMobile_Blocks:
INCBIN "maps/PokecomCenterAdminRoomMobile.blk"
MobileTradeRoomMobile_Blocks:
INCBIN "maps/MobileTradeRoomMobile.blk"

8
data/maps/data.asm
View File

@@ -524,7 +524,7 @@ ENDM
map_data GoldenrodGym, GOLDENROD_GYM, $00, 0
map_data GoldenrodBikeShop, GOLDENROD_BIKE_SHOP, $00, 0
map_data GoldenrodHappinessRater, GOLDENROD_HAPPINESS_RATER, $00, 0
map_data GoldenrodBillsHouse, GOLDENROD_BILLS_HOUSE, $00, 0
map_data BillsFamilysHouse, BILLS_FAMILYS_HOUSE, $00, 0
map_data GoldenrodMagnetTrainStation, GOLDENROD_MAGNET_TRAIN_STATION, $00, 0
map_data GoldenrodFlowerShop, GOLDENROD_FLOWER_SHOP, $00, 0
map_data GoldenrodPPSpeechHouse, GOLDENROD_PP_SPEECH_HOUSE, $00, 0
@@ -539,7 +539,7 @@ ENDM
map_data GoldenrodDeptStoreRoof, GOLDENROD_DEPT_STORE_ROOF, $24, 0
map_data GoldenrodGameCorner, GOLDENROD_GAME_CORNER, $00, 0
map_data GoldenrodPokecenter1F, GOLDENROD_POKECENTER_1F, $00, 0
map_data GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $00, 0
map_data PokecomCenterAdminRoomMobile, POKECOM_CENTER_ADMIN_ROOM_MOBILE, $00, 0
map_data IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $00, 0
map_data Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $00, 0
map_data DayCare, DAY_CARE, $00, 0
@@ -585,7 +585,7 @@ ENDM
map_data FuchsiaMart, FUCHSIA_MART, $00, 0
map_data SafariZoneMainOffice, SAFARI_ZONE_MAIN_OFFICE, $00, 0
map_data FuchsiaGym, FUCHSIA_GYM, $00, 0
map_data FuchsiaBillSpeechHouse, FUCHSIA_BILL_SPEECH_HOUSE, $00, 0
map_data BillsBrothersHouse, BILLS_BROTHERS_HOUSE, $00, 0
map_data FuchsiaPokecenter1F, FUCHSIA_POKECENTER_1F, $00, 0
map_data FuchsiaPokecenter2FBeta, FUCHSIA_POKECENTER_2F_BETA, $00, 0
map_data SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0
@@ -659,7 +659,7 @@ ENDM
map_data PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0
map_data ElmsHouse, ELMS_HOUSE, $00, 0
map_data Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $00, 0
map_data Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0
map_data DayOfWeekSiblingsHouse, DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0
map_data Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $00, 0
map_data Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $00, 0
map_data FightingDojo, FIGHTING_DOJO, $00, 0

8
data/maps/definitions.asm
View File

@@ -256,7 +256,7 @@ MapGroup_Goldenrod:
map_def GoldenrodGym, TILESET_ELITE_FOUR_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map_def GoldenrodBikeShop, TILESET_CHAMPIONS_ROOM, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def GoldenrodHappinessRater, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def GoldenrodBillsHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def BillsFamilysHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def GoldenrodMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def GoldenrodFlowerShop, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def GoldenrodPPSpeechHouse, TILESET_HOUSE, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@@ -271,7 +271,7 @@ MapGroup_Goldenrod:
map_def GoldenrodDeptStoreRoof, TILESET_MART, INDOOR, GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def GoldenrodGameCorner, TILESET_GAME_CORNER, INDOOR, GOLDENROD_CITY, MUSIC_GAME_CORNER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def GoldenrodPokecenter1F, TILESET_POKECENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def GoldenrodPokeComCenter2FMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def PokecomCenterAdminRoomMobile, TILESET_POKECOM_CENTER, INDOOR, GOLDENROD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def IlexForestAzaleaGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route34IlexForestGate, TILESET_GATE, GATE, ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def DayCare, TILESET_HOUSE, INDOOR, ROUTE_34, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@@ -342,7 +342,7 @@ MapGroup_Fuchsia:
map_def FuchsiaMart, TILESET_MART, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def SafariZoneMainOffice, TILESET_GAME_CORNER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def FuchsiaGym, TILESET_LAB, INDOOR, FUCHSIA_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map_def FuchsiaBillSpeechHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def BillsBrothersHouse, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def FuchsiaPokecenter1F, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def FuchsiaPokecenter2FBeta, TILESET_POKECENTER, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def SafariZoneWardensHome, TILESET_HOUSE, INDOOR, FUCHSIA_CITY, MUSIC_CELADON_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@@ -450,7 +450,7 @@ MapGroup_NewBark:
map_def PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route26HealSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route26DayofWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def DayOfWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route27SandstormHouse, TILESET_HOUSE, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE

8
data/maps/scripts.asm
View File

@@ -3,7 +3,7 @@ SECTION "Map Scripts 1", ROMX
INCLUDE "maps/GoldenrodGym.asm"
INCLUDE "maps/GoldenrodBikeShop.asm"
INCLUDE "maps/GoldenrodHappinessRater.asm"
INCLUDE "maps/GoldenrodBillsHouse.asm"
INCLUDE "maps/BillsFamilysHouse.asm"
INCLUDE "maps/GoldenrodMagnetTrainStation.asm"
INCLUDE "maps/GoldenrodFlowerShop.asm"
INCLUDE "maps/GoldenrodPPSpeechHouse.asm"
@@ -63,7 +63,7 @@ INCLUDE "maps/RadioTower5F.asm"
INCLUDE "maps/OlivineLighthouse5F.asm"
INCLUDE "maps/OlivineLighthouse6F.asm"
INCLUDE "maps/GoldenrodPokecenter1F.asm"
INCLUDE "maps/GoldenrodPokeComCenter2FMobile.asm"
INCLUDE "maps/PokecomCenterAdminRoomMobile.asm"
INCLUDE "maps/IlexForestAzaleaGate.asm"
INCLUDE "maps/Route34IlexForestGate.asm"
INCLUDE "maps/DayCare.asm"
@@ -156,7 +156,7 @@ INCLUDE "maps/PlayersHouse2F.asm"
INCLUDE "maps/PlayersNeighborsHouse.asm"
INCLUDE "maps/ElmsHouse.asm"
INCLUDE "maps/Route26HealSpeechHouse.asm"
INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm"
INCLUDE "maps/DayOfWeekSiblingsHouse.asm"
INCLUDE "maps/Route27SandstormHouse.asm"
INCLUDE "maps/Route29Route46Gate.asm"
@@ -361,7 +361,7 @@ INCLUDE "maps/MoveDeletersHouse.asm"
INCLUDE "maps/FuchsiaMart.asm"
INCLUDE "maps/SafariZoneMainOffice.asm"
INCLUDE "maps/FuchsiaGym.asm"
INCLUDE "maps/FuchsiaBillSpeechHouse.asm"
INCLUDE "maps/BillsBrothersHouse.asm"
INCLUDE "maps/FuchsiaPokecenter1F.asm"
INCLUDE "maps/FuchsiaPokecenter2FBeta.asm"
INCLUDE "maps/SafariZoneWardensHome.asm"