diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-04-10 13:39:55 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-04-10 13:39:55 -0400 |
| commit | 552febffe8a1dcb328ed32c246ceafabe380c7cc (patch) | |
| tree | 80018b3c8ba42072fbdaee252db2afae562c90b0 /maps.asm | |
| parent | a8fe0c13d42f5d5da7b864f9d6dd0eb1fdfe71a1 (diff) | |
| parent | 0a2b14309ab295a01c8597269c70acdee81f87ad (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'maps.asm')
| -rw-r--r-- | maps.asm | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -33,7 +33,7 @@ INCLUDE "maps/GoldenrodBillsHouse.asm" INCLUDE "maps/GoldenrodMagnetTrainStation.asm" INCLUDE "maps/GoldenrodFlowerShop.asm" INCLUDE "maps/GoldenrodPPSpeechHouse.asm" -INCLUDE "maps/GoldenrodNameRatersHouse.asm" +INCLUDE "maps/GoldenrodNameRater.asm" INCLUDE "maps/GoldenrodDeptStore1F.asm" INCLUDE "maps/GoldenrodDeptStore2F.asm" INCLUDE "maps/GoldenrodDeptStore3F.asm" @@ -241,7 +241,7 @@ SECTION "Map Scripts 12", ROMX, BANK[MAP_SCRIPTS_12] INCLUDE "maps/OlivinePokeCenter1F.asm" INCLUDE "maps/OlivineGym.asm" -INCLUDE "maps/OlivineVoltorbHouse.asm" +INCLUDE "maps/OlivineTimsHouse.asm" INCLUDE "maps/OlivineHouseBeta.asm" INCLUDE "maps/OlivinePunishmentSpeechHouse.asm" INCLUDE "maps/OlivineGoodRodHouse.asm" @@ -380,7 +380,7 @@ INCLUDE "maps/FuchsiaCity.asm" INCLUDE "maps/BlackthornGym1F.asm" INCLUDE "maps/BlackthornGym2F.asm" INCLUDE "maps/BlackthornDragonSpeechHouse.asm" -INCLUDE "maps/BlackthornDodrioTradeHouse.asm" +INCLUDE "maps/BlackthornEmysHouse.asm" INCLUDE "maps/BlackthornMart.asm" INCLUDE "maps/BlackthornPokeCenter1F.asm" INCLUDE "maps/MoveDeletersHouse.asm" |