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/VictoryRoad2F.asm | 46 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'data/maps/objects/VictoryRoad2F.asm') diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm index 84a32fa2..bb8c137b 100644 --- a/data/maps/objects/VictoryRoad2F.asm +++ b/data/maps/objects/VictoryRoad2F.asm @@ -1,30 +1,30 @@ VictoryRoad2F_Object: db $7d ; border block - def_warps - warp 0, 8, 2, VICTORY_ROAD_1F - warp 29, 7, 3, LAST_MAP - warp 29, 8, 3, LAST_MAP - warp 23, 7, 0, VICTORY_ROAD_3F - warp 25, 14, 2, VICTORY_ROAD_3F - warp 27, 7, 1, VICTORY_ROAD_3F - warp 1, 1, 3, VICTORY_ROAD_3F + def_warp_events + warp_event 0, 8, VICTORY_ROAD_1F, 2 + warp_event 29, 7, LAST_MAP, 3 + warp_event 29, 8, LAST_MAP, 3 + warp_event 23, 7, VICTORY_ROAD_3F, 0 + warp_event 25, 14, VICTORY_ROAD_3F, 2 + warp_event 27, 7, VICTORY_ROAD_3F, 1 + warp_event 1, 1, VICTORY_ROAD_3F, 3 - def_signs + def_bg_events - def_objects - object SPRITE_HIKER, 12, 9, STAY, LEFT, 1, OPP_BLACKBELT, 9 - object SPRITE_SUPER_NERD, 21, 13, STAY, LEFT, 2, OPP_JUGGLER, 2 - object SPRITE_COOLTRAINER_M, 19, 8, STAY, DOWN, 3, OPP_TAMER, 5 - object SPRITE_SUPER_NERD, 4, 2, STAY, DOWN, 4, OPP_POKEMANIAC, 6 - object SPRITE_SUPER_NERD, 26, 3, STAY, LEFT, 5, OPP_JUGGLER, 5 - object SPRITE_BIRD, 11, 5, STAY, UP, 6, MOLTRES, 50 - object SPRITE_POKE_BALL, 27, 5, STAY, NONE, 7, TM_SUBMISSION - object SPRITE_POKE_BALL, 18, 9, STAY, NONE, 8, FULL_HEAL - object SPRITE_POKE_BALL, 9, 11, STAY, NONE, 9, TM_MEGA_KICK - object SPRITE_POKE_BALL, 11, 0, STAY, NONE, 10, GUARD_SPEC - object SPRITE_BOULDER, 4, 14, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person - object SPRITE_BOULDER, 5, 5, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person - object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person + def_object_events + object_event 12, 9, SPRITE_HIKER, STAY, LEFT, 1, OPP_BLACKBELT, 9 + object_event 21, 13, SPRITE_SUPER_NERD, STAY, LEFT, 2, OPP_JUGGLER, 2 + object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5 + object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6 + object_event 26, 3, SPRITE_SUPER_NERD, STAY, LEFT, 5, OPP_JUGGLER, 5 + object_event 11, 5, SPRITE_BIRD, STAY, UP, 6, MOLTRES, 50 + object_event 27, 5, SPRITE_POKE_BALL, STAY, NONE, 7, TM_SUBMISSION + object_event 18, 9, SPRITE_POKE_BALL, STAY, NONE, 8, FULL_HEAL + object_event 9, 11, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_KICK + object_event 11, 0, SPRITE_POKE_BALL, STAY, NONE, 10, GUARD_SPEC + object_event 4, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person + object_event 5, 5, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person + object_event 23, 16, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person def_warps_to VICTORY_ROAD_2F -- cgit v1.3.1-sl0p