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/VermilionCity.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/VermilionCity.asm (renamed from data/mapObjects/vermilioncity.asm) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/VermilionCity.asm index f4e5f1ce..646f126a 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/VermilionCity.asm @@ -1,4 +1,4 @@ -VermilionCityObject: +VermilionCity_Object: db $43 ; border block db 9 ; warps @@ -6,11 +6,11 @@ VermilionCityObject: warp 9, 13, 0, POKEMON_FAN_CLUB warp 23, 13, 0, VERMILION_MART warp 12, 19, 0, VERMILION_GYM - warp 23, 19, 0, VERMILION_HOUSE_1 + warp 23, 19, 0, VERMILION_PIDGEY_HOUSE warp 18, 31, 0, VERMILION_DOCK warp 19, 31, 0, VERMILION_DOCK - warp 15, 13, 0, VERMILION_HOUSE_3 - warp 7, 3, 0, VERMILION_HOUSE_2 + warp 15, 13, 0, VERMILION_TRADE_HOUSE + warp 7, 3, 0, VERMILION_OLD_ROD_HOUSE db 7 ; signs sign 27, 3, 8 ; VermilionCityText7 |