diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-06 10:34:05 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-06 10:34:05 -0500 |
| commit | 4efb3e307cd6b4bf267ab0d509f8e5ab498f798e (patch) | |
| tree | cd405b6d1ca27c14bfbed4fd3c2fefe91be7ee33 /maps.asm | |
| parent | Merge pull request #60 from Rangi42/master (diff) | |
| download | pokeyellow-4efb3e307cd6b4bf267ab0d509f8e5ab498f798e.tar.gz pokeyellow-4efb3e307cd6b4bf267ab0d509f8e5ab498f798e.tar.xz pokeyellow-4efb3e307cd6b4bf267ab0d509f8e5ab498f798e.zip | |
Sync more with pokered
Diffstat (limited to 'maps.asm')
| -rw-r--r-- | maps.asm | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -96,7 +96,7 @@ Route2TradeHouse_Blocks: SaffronPidgeyHouse_Blocks: VermilionPidgeyHouse_Blocks: LavenderCuboneHouse_Blocks: -CeruleanTradeHouse_Blocks: +CeruleanMelaniesHouse_Blocks: PewterNidoranHouse_Blocks: PewterSpeechHouse_Blocks: ViridianNicknameHouse_Blocks: INCBIN "maps/ViridianNicknameHouse.blk" @@ -146,9 +146,9 @@ INCLUDE "data/maps/headers/CeruleanTrashedHouse.asm" INCLUDE "scripts/CeruleanTrashedHouse.asm" INCLUDE "data/maps/objects/CeruleanTrashedHouse.asm" -INCLUDE "data/maps/headers/CeruleanTradeHouse.asm" -INCLUDE "scripts/CeruleanTradeHouse.asm" -INCLUDE "data/maps/objects/CeruleanTradeHouse.asm" +INCLUDE "data/maps/headers/CeruleanMelaniesHouse.asm" +INCLUDE "scripts/CeruleanMelaniesHouse.asm" +INCLUDE "data/maps/objects/CeruleanMelaniesHouse.asm" INCLUDE "data/maps/headers/BikeShop.asm" INCLUDE "scripts/BikeShop.asm" |