diff options
Diffstat (limited to 'data/maps/scripts.asm')
| -rw-r--r-- | data/maps/scripts.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 51725fb4f..ff9974833 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -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/PokecomCenterAdminOfficeMobile.asm" INCLUDE "maps/IlexForestAzaleaGate.asm" INCLUDE "maps/Route34IlexForestGate.asm" INCLUDE "maps/DayCare.asm" @@ -151,12 +151,12 @@ SECTION "Map Scripts 9", ROMX INCLUDE "maps/Route34.asm" INCLUDE "maps/ElmsLab.asm" -INCLUDE "maps/KrissHouse1F.asm" -INCLUDE "maps/KrissHouse2F.asm" -INCLUDE "maps/KrissNeighborsHouse.asm" +INCLUDE "maps/PlayersHouse1F.asm" +INCLUDE "maps/PlayersHouse2F.asm" +INCLUDE "maps/PlayersNeighborsHouse.asm" INCLUDE "maps/ElmsHouse.asm" -INCLUDE "maps/Route26HealSpeechHouse.asm" -INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm" +INCLUDE "maps/Route26HealHouse.asm" +INCLUDE "maps/DayOfWeekSiblingsHouse.asm" INCLUDE "maps/Route27SandstormHouse.asm" INCLUDE "maps/Route29Route46Gate.asm" @@ -191,7 +191,7 @@ INCLUDE "maps/Route12SuperRodHouse.asm" SECTION "Map Scripts 11", ROMX -INCLUDE "maps/EcruteakHouse.asm" +INCLUDE "maps/EcruteakTinTowerEntrance.asm" INCLUDE "maps/WiseTriosRoom.asm" INCLUDE "maps/EcruteakPokecenter1F.asm" INCLUDE "maps/EcruteakLugiaSpeechHouse.asm" @@ -206,7 +206,7 @@ INCLUDE "maps/TrainerHouseB1F.asm" INCLUDE "maps/ViridianMart.asm" INCLUDE "maps/ViridianPokecenter1F.asm" INCLUDE "maps/ViridianPokecenter2FBeta.asm" -INCLUDE "maps/Route2NuggetSpeechHouse.asm" +INCLUDE "maps/Route2NuggetHouse.asm" INCLUDE "maps/Route2Gate.asm" INCLUDE "maps/VictoryRoadGate.asm" @@ -294,7 +294,7 @@ INCLUDE "maps/CopycatsHouse1F.asm" INCLUDE "maps/CopycatsHouse2F.asm" INCLUDE "maps/Route5UndergroundPathEntrance.asm" INCLUDE "maps/Route5SaffronGate.asm" -INCLUDE "maps/Route5CleanseTagSpeechHouse.asm" +INCLUDE "maps/Route5CleanseTagHouse.asm" SECTION "Map Scripts 16", ROMX @@ -329,13 +329,13 @@ SECTION "Map Scripts 17", ROMX INCLUDE "maps/MahoganyTown.asm" INCLUDE "maps/Route32.asm" -INCLUDE "maps/VermilionHouseFishingSpeechHouse.asm" +INCLUDE "maps/VermilionFishingSpeechHouse.asm" INCLUDE "maps/VermilionPokecenter1F.asm" INCLUDE "maps/VermilionPokecenter2FBeta.asm" INCLUDE "maps/PokemonFanClub.asm" INCLUDE "maps/VermilionMagnetTrainSpeechHouse.asm" INCLUDE "maps/VermilionMart.asm" -INCLUDE "maps/VermilionHouseDiglettsCaveSpeechHouse.asm" +INCLUDE "maps/VermilionDiglettsCaveSpeechHouse.asm" INCLUDE "maps/VermilionGym.asm" INCLUDE "maps/Route6SaffronGate.asm" INCLUDE "maps/Route6UndergroundPathEntrance.asm" @@ -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" @@ -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" @@ -371,7 +371,7 @@ INCLUDE "maps/CherrygrovePokecenter1F.asm" INCLUDE "maps/CherrygroveGymSpeechHouse.asm" INCLUDE "maps/GuideGentsHouse.asm" INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm" -INCLUDE "maps/Route30BerrySpeechHouse.asm" +INCLUDE "maps/Route30BerryHouse.asm" INCLUDE "maps/MrPokemonsHouse.asm" INCLUDE "maps/Route31VioletGate.asm" @@ -477,7 +477,7 @@ INCLUDE "maps/Route4.asm" INCLUDE "maps/Route10South.asm" INCLUDE "maps/Route23.asm" INCLUDE "maps/SilverCavePokecenter1F.asm" -INCLUDE "maps/Route28FamousSpeechHouse.asm" +INCLUDE "maps/Route28SteelWingHouse.asm" SECTION "Map Scripts 25", ROMX |