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/PewterGym.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/maps/objects/PewterGym.asm') diff --git a/data/maps/objects/PewterGym.asm b/data/maps/objects/PewterGym.asm index 9c21701a..2e3fb6ed 100644 --- a/data/maps/objects/PewterGym.asm +++ b/data/maps/objects/PewterGym.asm @@ -1,15 +1,15 @@ PewterGym_Object: db $3 ; border block - def_warps - warp 4, 13, 2, LAST_MAP - warp 5, 13, 2, LAST_MAP + def_warp_events + warp_event 4, 13, LAST_MAP, 2 + warp_event 5, 13, LAST_MAP, 2 - def_signs + def_bg_events - def_objects - object SPRITE_SUPER_NERD, 4, 1, STAY, DOWN, 1, OPP_BROCK, 1 - object SPRITE_COOLTRAINER_M, 3, 6, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 - object SPRITE_GYM_GUIDE, 7, 10, STAY, DOWN, 3 ; person + def_object_events + object_event 4, 1, SPRITE_SUPER_NERD, STAY, DOWN, 1, OPP_BROCK, 1 + object_event 3, 6, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_JR_TRAINER_M, 1 + object_event 7, 10, SPRITE_GYM_GUIDE, STAY, DOWN, 3 ; person def_warps_to PEWTER_GYM -- cgit v1.3.1-sl0p