From 2c4f35848b786864822a3f211df91de30a2857c9 Mon Sep 17 00:00:00 2001 From: Yoann Fievez Date: Mon, 27 Sep 2021 04:56:09 +0200 Subject: 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 --- data/maps/objects/Route15Gate2F.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/maps/objects/Route15Gate2F.asm') diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm index 608b69e5..d57bddab 100644 --- a/data/maps/objects/Route15Gate2F.asm +++ b/data/maps/objects/Route15Gate2F.asm @@ -1,13 +1,13 @@ Route15Gate2F_Object: db $a ; border block - def_warps - warp 7, 7, 4, ROUTE_15_GATE_1F + def_warp_events + warp_event 7, 7, ROUTE_15_GATE_1F, 4 - def_signs - sign 6, 2, 2 ; Route15GateUpstairsText2 + def_bg_events + bg_event 6, 2, 2 ; Route15GateUpstairsText2 - def_objects - object SPRITE_SCIENTIST, 4, 2, STAY, DOWN, 1 + def_object_events + object_event 4, 2, SPRITE_SCIENTIST, STAY, DOWN, 1 def_warps_to ROUTE_15_GATE_2F -- cgit v1.3.1-sl0p