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/Route1.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/maps/objects/Route1.asm') diff --git a/data/maps/objects/Route1.asm b/data/maps/objects/Route1.asm index ee1b03a5..d7e2c751 100644 --- a/data/maps/objects/Route1.asm +++ b/data/maps/objects/Route1.asm @@ -1,14 +1,14 @@ Route1_Object: db $b ; border block - def_warps + def_warp_events - def_signs - sign 9, 27, 3 ; Route1Text3 + def_bg_events + bg_event 9, 27, 3 ; Route1Text3 - def_objects - object SPRITE_YOUNGSTER, 5, 24, WALK, UP_DOWN, 1 ; person - object SPRITE_YOUNGSTER, 15, 13, WALK, LEFT_RIGHT, 2 ; person + def_object_events + object_event 5, 24, SPRITE_YOUNGSTER, WALK, UP_DOWN, 1 ; person + object_event 15, 13, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person def_warps_to ROUTE_1 -- cgit v1.3.1-sl0p