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 | |
| parent | 5db3bdd6551fad07066b669db1e44a6151aaa0b4 (diff) | |
Sync more with pokered
Diffstat (limited to 'data/maps/objects')
| -rwxr-xr-x | data/maps/objects/CeruleanCity.asm | 2 | ||||
| -rwxr-xr-x | data/maps/objects/CeruleanMelaniesHouse.asm (renamed from data/maps/objects/CeruleanTradeHouse.asm) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm index fae56fc1..2d155e25 100755 --- a/data/maps/objects/CeruleanCity.asm +++ b/data/maps/objects/CeruleanCity.asm @@ -3,7 +3,7 @@ CeruleanCity_Object: def_warps warp 27, 11, 0, CERULEAN_TRASHED_HOUSE - warp 13, 15, 0, CERULEAN_TRADE_HOUSE + warp 13, 15, 0, CERULEAN_MELANIES_HOUSE warp 19, 17, 0, CERULEAN_POKECENTER warp 30, 19, 0, CERULEAN_GYM warp 13, 25, 0, BIKE_SHOP 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 |