summaryrefslogtreecommitdiff
path: root/data/maps/objects/CeladonMansion3F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeladonMansion3F.asm')
-rw-r--r--data/maps/objects/CeladonMansion3F.asm30
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/objects/CeladonMansion3F.asm b/data/maps/objects/CeladonMansion3F.asm
index 442f3c23..033ba346 100644
--- a/data/maps/objects/CeladonMansion3F.asm
+++ b/data/maps/objects/CeladonMansion3F.asm
@@ -1,22 +1,22 @@
CeladonMansion3F_Object:
db $f ; border block
- def_warps
- warp 6, 1, 0, CELADON_MANSION_2F
- warp 7, 1, 0, CELADON_MANSION_ROOF
- warp 2, 1, 1, CELADON_MANSION_ROOF
- warp 4, 1, 3, CELADON_MANSION_2F
+ def_warp_events
+ warp_event 6, 1, CELADON_MANSION_2F, 0
+ warp_event 7, 1, CELADON_MANSION_ROOF, 0
+ warp_event 2, 1, CELADON_MANSION_ROOF, 1
+ warp_event 4, 1, CELADON_MANSION_2F, 3
- def_signs
- sign 1, 3, 5 ; CeladonMansion3Text5
- sign 4, 3, 6 ; CeladonMansion3Text6
- sign 1, 6, 7 ; CeladonMansion3Text7
- sign 4, 9, 8 ; CeladonMansion3Text8
+ def_bg_events
+ bg_event 1, 3, 5 ; CeladonMansion3Text5
+ bg_event 4, 3, 6 ; CeladonMansion3Text6
+ bg_event 1, 6, 7 ; CeladonMansion3Text7
+ bg_event 4, 9, 8 ; CeladonMansion3Text8
- def_objects
- object SPRITE_BIKE_SHOP_CLERK, 0, 4, STAY, UP, 1 ; person
- object SPRITE_CLERK, 3, 4, STAY, UP, 2 ; person
- object SPRITE_SUPER_NERD, 0, 7, STAY, UP, 3 ; person
- object SPRITE_SILPH_WORKER, 2, 3, STAY, NONE, 4 ; person
+ def_object_events
+ object_event 0, 4, SPRITE_BIKE_SHOP_CLERK, STAY, UP, 1 ; person
+ object_event 3, 4, SPRITE_CLERK, STAY, UP, 2 ; person
+ object_event 0, 7, SPRITE_SUPER_NERD, STAY, UP, 3 ; person
+ object_event 2, 3, SPRITE_SILPH_WORKER, STAY, NONE, 4 ; person
def_warps_to CELADON_MANSION_3F