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/PewterCity.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/PewterCity.asm (renamed from data/mapObjects/pewtercity.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/pewtercity.asm b/data/mapObjects/PewterCity.asm index 8ad183dc..e1a3eecb 100755 --- a/data/mapObjects/pewtercity.asm +++ b/data/mapObjects/PewterCity.asm @@ -1,13 +1,13 @@ -PewterCityObject: +PewterCity_Object: db $a ; border block db 7 ; warps warp 14, 7, 0, MUSEUM_1F warp 19, 5, 2, MUSEUM_1F warp 16, 17, 0, PEWTER_GYM - warp 29, 13, 0, PEWTER_HOUSE_1 + warp 29, 13, 0, PEWTER_NIDORAN_HOUSE warp 23, 17, 0, PEWTER_MART - warp 7, 29, 0, PEWTER_HOUSE_2 + warp 7, 29, 0, PEWTER_SPEECH_HOUSE warp 13, 25, 0, PEWTER_POKECENTER db 7 ; signs |