summaryrefslogtreecommitdiff
path: root/data/maps/objects/MtMoonB1F.asm
diff options
context:
space:
mode:
authorYoann Fievez <yoann.fievez@gmail.com>2021-09-27 04:56:09 +0200
committerGitHub <noreply@github.com>2021-09-26 21:56:09 -0500
commit2c4f35848b786864822a3f211df91de30a2857c9 (patch)
treefcf65394ef3a2361d4dce8bd6cadaac8c9d021d3 /data/maps/objects/MtMoonB1F.asm
parentf1285f8584ce7ff50ceb5e3134c0efc867209096 (diff)
Unify map event gen1 gen2 (#335)
* Update sign to bg_event #289 * Rename warp to warp_event * Replace object to object_event * Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
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