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/SaffronCity.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/SaffronCity.asm (renamed from data/mapObjects/saffroncity.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/saffroncity.asm b/data/mapObjects/SaffronCity.asm index 6ff8ea93..fd8ed6b1 100755 --- a/data/mapObjects/saffroncity.asm +++ b/data/mapObjects/SaffronCity.asm @@ -1,15 +1,15 @@ -SaffronCityObject: +SaffronCity_Object: db $f ; border block db 8 ; warps warp 7, 5, 0, COPYCATS_HOUSE_1F warp 26, 3, 0, FIGHTING_DOJO warp 34, 3, 0, SAFFRON_GYM - warp 13, 11, 0, SAFFRON_HOUSE_1 + warp 13, 11, 0, SAFFRON_PIDGEY_HOUSE warp 25, 11, 0, SAFFRON_MART warp 18, 21, 0, SILPH_CO_1F warp 9, 29, 0, SAFFRON_POKECENTER - warp 29, 29, 0, SAFFRON_HOUSE_2 + warp 29, 29, 0, MR_PSYCHICS_HOUSE db 10 ; signs sign 17, 5, 16 ; SaffronCityText16 |