summaryrefslogtreecommitdiff
path: root/data/maps/objects/Route12Gate2F.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-09-26 22:38:47 -0500
committerdannye <33dannye@gmail.com>2021-09-26 22:43:09 -0500
commit501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch)
treec2fe5cc6caa9d8117df3008031d7a26317058acb /data/maps/objects/Route12Gate2F.asm
parent45c039801916713e4066644086de4d4940d5fa1d (diff)
parent30acb46b988d4bb54af761696123778acd8517e3 (diff)
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/Route12Gate2F.asm')
-rw-r--r--data/maps/objects/Route12Gate2F.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/objects/Route12Gate2F.asm b/data/maps/objects/Route12Gate2F.asm
index 413adf25..c1590119 100644
--- a/data/maps/objects/Route12Gate2F.asm
+++ b/data/maps/objects/Route12Gate2F.asm
@@ -1,14 +1,14 @@
Route12Gate2F_Object:
db $a ; border block
- def_warps
- warp 7, 7, 4, ROUTE_12_GATE_1F
+ def_warp_events
+ warp_event 7, 7, ROUTE_12_GATE_1F, 4
- def_signs
- sign 1, 2, 2 ; Route12GateUpstairsText2
- sign 6, 2, 3 ; Route12GateUpstairsText3
+ def_bg_events
+ bg_event 1, 2, 2 ; Route12GateUpstairsText2
+ bg_event 6, 2, 3 ; Route12GateUpstairsText3
- def_objects
- object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, UP_DOWN, 1 ; person
+ def_object_events
+ object_event 3, 4, SPRITE_BRUNETTE_GIRL, WALK, UP_DOWN, 1 ; person
def_warps_to ROUTE_12_GATE_2F