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/Route2.asm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/maps/objects/Route2.asm') diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm index 66f9ff1e..e38df5a1 100644 --- a/data/maps/objects/Route2.asm +++ b/data/maps/objects/Route2.asm @@ -1,21 +1,21 @@ Route2_Object: db $f ; border block - def_warps - warp 12, 9, 0, DIGLETTS_CAVE_ROUTE_2 - warp 3, 11, 1, VIRIDIAN_FOREST_NORTH_GATE - warp 15, 19, 0, ROUTE_2_TRADE_HOUSE - warp 16, 35, 1, ROUTE_2_GATE - warp 15, 39, 2, ROUTE_2_GATE - warp 3, 43, 2, VIRIDIAN_FOREST_SOUTH_GATE + def_warp_events + warp_event 12, 9, DIGLETTS_CAVE_ROUTE_2, 0 + warp_event 3, 11, VIRIDIAN_FOREST_NORTH_GATE, 1 + warp_event 15, 19, ROUTE_2_TRADE_HOUSE, 0 + warp_event 16, 35, ROUTE_2_GATE, 1 + warp_event 15, 39, ROUTE_2_GATE, 2 + warp_event 3, 43, VIRIDIAN_FOREST_SOUTH_GATE, 2 - def_signs - sign 5, 65, 3 ; Route2Text3 - sign 11, 11, 4 ; Route2Text4 + def_bg_events + bg_event 5, 65, 3 ; Route2Text3 + bg_event 11, 11, 4 ; Route2Text4 - def_objects - object SPRITE_POKE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE - object SPRITE_POKE_BALL, 13, 45, STAY, NONE, 2, HP_UP + def_object_events + object_event 13, 54, SPRITE_POKE_BALL, STAY, NONE, 1, MOON_STONE + object_event 13, 45, SPRITE_POKE_BALL, STAY, NONE, 2, HP_UP def_warps_to ROUTE_2 -- cgit v1.2.3