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/SSAnneBow.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/SSAnneBow.asm (renamed from data/mapObjects/ssanne5.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/SSAnneBow.asm index 106557be..8873c8f8 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/SSAnneBow.asm @@ -1,9 +1,9 @@ -SSAnne5Object: +SSAnneBow_Object: db $23 ; border block db 2 ; warps - warp 13, 6, 0, SS_ANNE_3 - warp 13, 7, 0, SS_ANNE_3 + warp 13, 6, 0, SS_ANNE_3F + warp 13, 7, 0, SS_ANNE_3F db 0 ; signs @@ -15,5 +15,5 @@ SSAnne5Object: object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2 ; warp-to - warp_to 13, 6, SS_ANNE_5_WIDTH ; SS_ANNE_3 - warp_to 13, 7, SS_ANNE_5_WIDTH ; SS_ANNE_3 + warp_to 13, 6, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F + warp_to 13, 7, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F |