diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-01-13 22:38:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-13 22:38:16 -0600 |
| commit | 725b86ebbec23bd1f53fd60bf0201c904fee951d (patch) | |
| tree | a37f4d33c5b77635c7ff72b91a73fcd90c4af915 /data/mapObjects/SafariZoneWest.asm | |
| parent | Merge pull request #195 from Rangi42/master (diff) | |
| parent | Rename map files, labels, and constants to be consistent and work with Polish... (diff) | |
| download | pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip | |
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/SafariZoneWest.asm (renamed from data/mapObjects/safarizonewest.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/safarizonewest.asm b/data/mapObjects/SafariZoneWest.asm index 5d3c6d19..7faced72 100755 --- a/data/mapObjects/safarizonewest.asm +++ b/data/mapObjects/SafariZoneWest.asm @@ -1,4 +1,4 @@ -SafariZoneWestObject: +SafariZoneWest_Object: db $0 ; border block db 8 ; warps @@ -9,7 +9,7 @@ SafariZoneWestObject: warp 29, 22, 2, SAFARI_ZONE_CENTER warp 29, 23, 3, SAFARI_ZONE_CENTER warp 3, 3, 0, SAFARI_ZONE_SECRET_HOUSE - warp 11, 11, 0, SAFARI_ZONE_REST_HOUSE_2 + warp 11, 11, 0, SAFARI_ZONE_WEST_REST_HOUSE db 4 ; signs sign 12, 12, 5 ; SafariZoneWestText5 @@ -31,4 +31,4 @@ SafariZoneWestObject: warp_to 29, 22, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER warp_to 29, 23, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_CENTER warp_to 3, 3, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_SECRET_HOUSE - warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_REST_HOUSE_2 + warp_to 11, 11, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_WEST_REST_HOUSE |