summaryrefslogtreecommitdiff
path: root/data/maps/objects/CeladonMansion1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeladonMansion1F.asm')
-rwxr-xr-xdata/maps/objects/CeladonMansion1F.asm13
1 files changed, 4 insertions, 9 deletions
diff --git a/data/maps/objects/CeladonMansion1F.asm b/data/maps/objects/CeladonMansion1F.asm
index abb3006c..10c866ff 100755
--- a/data/maps/objects/CeladonMansion1F.asm
+++ b/data/maps/objects/CeladonMansion1F.asm
@@ -1,25 +1,20 @@
CeladonMansion1F_Object:
db $f ; border block
- db 5 ; warps
+ def_warps
warp 4, 11, 2, LAST_MAP
warp 5, 11, 2, LAST_MAP
warp 4, 0, 4, LAST_MAP
warp 7, 1, 1, CELADON_MANSION_2F
warp 2, 1, 2, CELADON_MANSION_2F
- db 1 ; signs
+ def_signs
sign 4, 9, 5 ; CeladonMansion1Text5
- db 4 ; objects
+ def_objects
object SPRITE_MONSTER, 0, 5, STAY, RIGHT, 1 ; person
object SPRITE_GRANNY, 1, 5, STAY, DOWN, 2 ; person
object SPRITE_FAIRY, 1, 8, WALK, LEFT_RIGHT, 3 ; person
object SPRITE_MONSTER, 4, 4, WALK, UP_DOWN, 4 ; person
- ; warp-to
- warp_to 4, 11, CELADON_MANSION_1F_WIDTH
- warp_to 5, 11, CELADON_MANSION_1F_WIDTH
- warp_to 4, 0, CELADON_MANSION_1F_WIDTH
- warp_to 7, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F
- warp_to 2, 1, CELADON_MANSION_1F_WIDTH ; CELADON_MANSION_2F
+ def_warps_to CELADON_MANSION_1F