diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/LavenderTown.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/LavenderTown.asm (renamed from data/mapObjects/lavendertown.asm) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/lavendertown.asm b/data/mapObjects/LavenderTown.asm index c694d763..4aead666 100755 --- a/data/mapObjects/lavendertown.asm +++ b/data/mapObjects/LavenderTown.asm @@ -1,12 +1,12 @@ -LavenderTownObject: +LavenderTown_Object: db $2c ; border block db 6 ; warps warp 3, 5, 0, LAVENDER_POKECENTER - warp 14, 5, 0, POKEMONTOWER_1 - warp 7, 9, 0, LAVENDER_HOUSE_1 + warp 14, 5, 0, POKEMON_TOWER_1F + warp 7, 9, 0, MR_FUJIS_HOUSE warp 15, 13, 0, LAVENDER_MART - warp 3, 13, 0, LAVENDER_HOUSE_2 + warp 3, 13, 0, LAVENDER_CUBONE_HOUSE warp 7, 13, 0, NAME_RATERS_HOUSE db 6 ; signs |