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/SSAnneBow.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'data/maps/objects/SSAnneBow.asm') diff --git a/data/maps/objects/SSAnneBow.asm b/data/maps/objects/SSAnneBow.asm index 080fe623..ec0389df 100644 --- a/data/maps/objects/SSAnneBow.asm +++ b/data/maps/objects/SSAnneBow.asm @@ -1,17 +1,17 @@ SSAnneBow_Object: db $23 ; border block - def_warps - warp 13, 6, 0, SS_ANNE_3F - warp 13, 7, 0, SS_ANNE_3F + def_warp_events + warp_event 13, 6, SS_ANNE_3F, 0 + warp_event 13, 7, SS_ANNE_3F, 0 - def_signs + def_bg_events - def_objects - object SPRITE_SUPER_NERD, 5, 2, STAY, UP, 1 ; person - object SPRITE_SAILOR, 4, 9, STAY, NONE, 2 ; person - object SPRITE_COOLTRAINER_M, 7, 11, STAY, NONE, 3 ; person - object SPRITE_SAILOR, 4, 4, STAY, DOWN, 4, OPP_SAILOR, 1 - object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2 + def_object_events + object_event 5, 2, SPRITE_SUPER_NERD, STAY, UP, 1 ; person + object_event 4, 9, SPRITE_SAILOR, STAY, NONE, 2 ; person + object_event 7, 11, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person + object_event 4, 4, SPRITE_SAILOR, STAY, DOWN, 4, OPP_SAILOR, 1 + object_event 10, 8, SPRITE_SAILOR, STAY, UP, 5, OPP_SAILOR, 2 def_warps_to SS_ANNE_BOW -- cgit v1.3.1-sl0p