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/Route14.asm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'data/maps/objects/Route14.asm') diff --git a/data/maps/objects/Route14.asm b/data/maps/objects/Route14.asm index 4a2240e6..8808f501 100644 --- a/data/maps/objects/Route14.asm +++ b/data/maps/objects/Route14.asm @@ -1,21 +1,21 @@ Route14_Object: db $43 ; border block - def_warps + def_warp_events - def_signs - sign 17, 13, 11 ; Route14Text11 + def_bg_events + bg_event 17, 13, 11 ; Route14Text11 - def_objects - object SPRITE_COOLTRAINER_M, 4, 4, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 - object SPRITE_COOLTRAINER_M, 15, 6, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 - object SPRITE_COOLTRAINER_M, 12, 11, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16 - object SPRITE_COOLTRAINER_M, 14, 15, STAY, UP, 4, OPP_BIRD_KEEPER, 17 - object SPRITE_COOLTRAINER_M, 15, 31, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4 - object SPRITE_COOLTRAINER_M, 6, 49, STAY, UP, 6, OPP_BIRD_KEEPER, 5 - object SPRITE_BIKER, 5, 39, STAY, DOWN, 7, OPP_BIKER, 13 - object SPRITE_BIKER, 4, 30, STAY, RIGHT, 8, OPP_BIKER, 14 - object SPRITE_BIKER, 15, 30, STAY, LEFT, 9, OPP_BIKER, 15 - object SPRITE_BIKER, 4, 31, STAY, RIGHT, 10, OPP_BIKER, 2 + def_object_events + object_event 4, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 1, OPP_BIRD_KEEPER, 14 + object_event 15, 6, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_BIRD_KEEPER, 15 + object_event 12, 11, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_BIRD_KEEPER, 16 + object_event 14, 15, SPRITE_COOLTRAINER_M, STAY, UP, 4, OPP_BIRD_KEEPER, 17 + object_event 15, 31, SPRITE_COOLTRAINER_M, STAY, LEFT, 5, OPP_BIRD_KEEPER, 4 + object_event 6, 49, SPRITE_COOLTRAINER_M, STAY, UP, 6, OPP_BIRD_KEEPER, 5 + object_event 5, 39, SPRITE_BIKER, STAY, DOWN, 7, OPP_BIKER, 13 + object_event 4, 30, SPRITE_BIKER, STAY, RIGHT, 8, OPP_BIKER, 14 + object_event 15, 30, SPRITE_BIKER, STAY, LEFT, 9, OPP_BIKER, 15 + object_event 4, 31, SPRITE_BIKER, STAY, RIGHT, 10, OPP_BIKER, 2 def_warps_to ROUTE_14 -- cgit v1.3.1-sl0p