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/Route11Gate2F.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/maps/objects/Route11Gate2F.asm') diff --git a/data/maps/objects/Route11Gate2F.asm b/data/maps/objects/Route11Gate2F.asm index fa48409c..7dc52e2f 100644 --- a/data/maps/objects/Route11Gate2F.asm +++ b/data/maps/objects/Route11Gate2F.asm @@ -1,15 +1,15 @@ Route11Gate2F_Object: db $a ; border block - def_warps - warp 7, 7, 4, ROUTE_11_GATE_1F + def_warp_events + warp_event 7, 7, ROUTE_11_GATE_1F, 4 - def_signs - sign 1, 2, 3 ; Route11GateUpstairsText3 - sign 6, 2, 4 ; Route11GateUpstairsText4 + def_bg_events + bg_event 1, 2, 3 ; Route11GateUpstairsText3 + bg_event 6, 2, 4 ; Route11GateUpstairsText4 - def_objects - object SPRITE_YOUNGSTER, 4, 2, WALK, LEFT_RIGHT, 1 ; person - object SPRITE_SCIENTIST, 2, 6, STAY, NONE, 2 ; person + def_object_events + object_event 4, 2, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person + object_event 2, 6, SPRITE_SCIENTIST, STAY, NONE, 2 ; person def_warps_to ROUTE_11_GATE_2F -- cgit v1.2.3