aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/SSAnneKitchen.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 15:06:23 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2019-01-01 23:33:10 -0500
commitc7796024590fec48ac79756793c1a6e3b54daf8f (patch)
tree0d61caa7ebe429995a61e800d1d78c3a82aec886 /data/mapObjects/SSAnneKitchen.asm
parentMerge pull request #193 from luckytyphlosion/master (diff)
downloadpokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.gz
pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.xz
pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.zip
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
-rwxr-xr-xdata/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