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/SSAnneKitchen.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/SSAnneKitchen.asm (renamed from data/mapObjects/ssanne6.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/ssanne6.asm b/data/mapObjects/SSAnneKitchen.asm index a25fe9b3..b5771e68 100755 --- a/data/mapObjects/ssanne6.asm +++ b/data/mapObjects/SSAnneKitchen.asm @@ -1,8 +1,8 @@ -SSAnne6Object: +SSAnneKitchen_Object: db $c ; border block db 1 ; warps - warp 6, 0, 10, SS_ANNE_1 + warp 6, 0, 10, SS_ANNE_1F db 0 ; signs @@ -16,4 +16,4 @@ SSAnne6Object: object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person ; warp-to - warp_to 6, 0, SS_ANNE_6_WIDTH ; SS_ANNE_1 + warp_to 6, 0, SS_ANNE_KITCHEN_WIDTH ; SS_ANNE_1F |