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/fuchsiacity.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/FuchsiaCity.asm (renamed from data/mapObjects/fuchsiacity.asm) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/FuchsiaCity.asm index 35f9365d..0368905c 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/FuchsiaCity.asm @@ -1,16 +1,16 @@ -FuchsiaCityObject: +FuchsiaCity_Object: db $f ; border block db 9 ; warps warp 5, 13, 0, FUCHSIA_MART - warp 11, 27, 0, FUCHSIA_HOUSE_1 + warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE warp 19, 27, 0, FUCHSIA_POKECENTER - warp 27, 27, 0, FUCHSIA_HOUSE_2 - warp 18, 3, 0, SAFARI_ZONE_ENTRANCE + warp 27, 27, 0, WARDENS_HOUSE + warp 18, 3, 0, SAFARI_ZONE_GATE warp 5, 27, 0, FUCHSIA_GYM warp 22, 13, 0, FUCHSIA_MEETING_ROOM - warp 31, 27, 1, FUCHSIA_HOUSE_3 - warp 31, 24, 0, FUCHSIA_HOUSE_3 + warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE + warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE db 14 ; signs sign 15, 23, 11 ; FuchsiaCityText11 |