summaryrefslogtreecommitdiff
path: root/data/maps/objects/FightingDojo.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/FightingDojo.asm')
-rw-r--r--data/maps/objects/FightingDojo.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/objects/FightingDojo.asm b/data/maps/objects/FightingDojo.asm
index 5345a7aa..61be63a4 100644
--- a/data/maps/objects/FightingDojo.asm
+++ b/data/maps/objects/FightingDojo.asm
@@ -1,19 +1,19 @@
FightingDojo_Object:
db $3 ; border block
- def_warps
- warp 4, 11, 1, LAST_MAP
- warp 5, 11, 1, LAST_MAP
+ def_warp_events
+ warp_event 4, 11, LAST_MAP, 1
+ warp_event 5, 11, LAST_MAP, 1
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_HIKER, 5, 3, STAY, DOWN, 1, OPP_BLACKBELT, 1
- object SPRITE_HIKER, 3, 4, STAY, RIGHT, 2, OPP_BLACKBELT, 2
- object SPRITE_HIKER, 3, 6, STAY, RIGHT, 3, OPP_BLACKBELT, 3
- object SPRITE_HIKER, 5, 5, STAY, LEFT, 4, OPP_BLACKBELT, 4
- object SPRITE_HIKER, 5, 7, STAY, LEFT, 5, OPP_BLACKBELT, 5
- object SPRITE_POKE_BALL, 4, 1, STAY, NONE, 6 ; person
- object SPRITE_POKE_BALL, 5, 1, STAY, NONE, 7 ; person
+ def_object_events
+ object_event 5, 3, SPRITE_HIKER, STAY, DOWN, 1, OPP_BLACKBELT, 1
+ object_event 3, 4, SPRITE_HIKER, STAY, RIGHT, 2, OPP_BLACKBELT, 2
+ object_event 3, 6, SPRITE_HIKER, STAY, RIGHT, 3, OPP_BLACKBELT, 3
+ object_event 5, 5, SPRITE_HIKER, STAY, LEFT, 4, OPP_BLACKBELT, 4
+ object_event 5, 7, SPRITE_HIKER, STAY, LEFT, 5, OPP_BLACKBELT, 5
+ object_event 4, 1, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
+ object_event 5, 1, SPRITE_POKE_BALL, STAY, NONE, 7 ; person
def_warps_to FIGHTING_DOJO