aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/MtMoonB1F.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/MtMoonB1F.asm
parentSwitch from Travis CI to GitHub Actions (diff)
parentFix typos (#334) (diff)
downloadpokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz
pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz
pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/MtMoonB1F.asm')
-rw-r--r--data/maps/objects/MtMoonB1F.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm
index 69fa3c17..831618e9 100644
--- a/data/maps/objects/MtMoonB1F.asm
+++ b/data/maps/objects/MtMoonB1F.asm
@@ -1,18 +1,18 @@
MtMoonB1F_Object:
db $3 ; border block
- def_warps
- warp 5, 5, 2, MT_MOON_1F
- warp 17, 11, 0, MT_MOON_B2F
- warp 25, 9, 3, MT_MOON_1F
- warp 25, 15, 4, MT_MOON_1F
- warp 21, 17, 1, MT_MOON_B2F
- warp 13, 27, 2, MT_MOON_B2F
- warp 23, 3, 3, MT_MOON_B2F
- warp 27, 3, 2, LAST_MAP
+ def_warp_events
+ warp_event 5, 5, MT_MOON_1F, 2
+ warp_event 17, 11, MT_MOON_B2F, 0
+ warp_event 25, 9, MT_MOON_1F, 3
+ warp_event 25, 15, MT_MOON_1F, 4
+ warp_event 21, 17, MT_MOON_B2F, 1
+ warp_event 13, 27, MT_MOON_B2F, 2
+ warp_event 23, 3, MT_MOON_B2F, 3
+ warp_event 27, 3, LAST_MAP, 2
- def_signs
+ def_bg_events
- def_objects
+ def_object_events
def_warps_to MT_MOON_B1F