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 /data/maps/objects/CeruleanTradeHouse.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 '')
| -rwxr-xr-x | data/maps/objects/CeruleanMelaniesHouse.asm (renamed from data/maps/objects/CeruleanTradeHouse.asm) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanMelaniesHouse.asm index a52548fe..cbd25533 100755 --- a/data/maps/objects/CeruleanTradeHouse.asm +++ b/data/maps/objects/CeruleanMelaniesHouse.asm @@ -1,4 +1,4 @@ -CeruleanTradeHouse_Object: +CeruleanMelaniesHouse_Object: db $a ; border block def_warps @@ -13,4 +13,4 @@ CeruleanTradeHouse_Object: object SPRITE_ODDISH, 1, 4, STAY, NONE, 3 ; person object SPRITE_SANDSHREW, 5, 3, STAY, LEFT, 4 ; person - def_warps_to CERULEAN_TRADE_HOUSE + def_warps_to CERULEAN_MELANIES_HOUSE |