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/ViridianForestSouthGate.asm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/maps/objects/ViridianForestSouthGate.asm') diff --git a/data/maps/objects/ViridianForestSouthGate.asm b/data/maps/objects/ViridianForestSouthGate.asm index 3693e7ec..1ed22076 100644 --- a/data/maps/objects/ViridianForestSouthGate.asm +++ b/data/maps/objects/ViridianForestSouthGate.asm @@ -1,16 +1,16 @@ ViridianForestSouthGate_Object: db $a ; border block - def_warps - warp 4, 0, 3, VIRIDIAN_FOREST - warp 5, 0, 4, VIRIDIAN_FOREST - warp 4, 7, 5, LAST_MAP - warp 5, 7, 5, LAST_MAP + def_warp_events + warp_event 4, 0, VIRIDIAN_FOREST, 3 + warp_event 5, 0, VIRIDIAN_FOREST, 4 + warp_event 4, 7, LAST_MAP, 5 + warp_event 5, 7, LAST_MAP, 5 - def_signs + def_bg_events - def_objects - object SPRITE_GIRL, 8, 4, STAY, LEFT, 1 ; person - object SPRITE_LITTLE_GIRL, 2, 4, WALK, UP_DOWN, 2 ; person + def_object_events + object_event 8, 4, SPRITE_GIRL, STAY, LEFT, 1 ; person + object_event 2, 4, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 2 ; person def_warps_to VIRIDIAN_FOREST_SOUTH_GATE -- cgit v1.3.1-sl0p