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/PokemonFanClub.asm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/maps/objects/PokemonFanClub.asm') diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index 19fbb129..e845a083 100644 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -1,20 +1,20 @@ PokemonFanClub_Object: db $d ; border block - def_warps - warp 2, 7, 1, LAST_MAP - warp 3, 7, 1, LAST_MAP + def_warp_events + warp_event 2, 7, LAST_MAP, 1 + warp_event 3, 7, LAST_MAP, 1 - def_signs - sign 1, 0, 7 ; FanClubText7 - sign 6, 0, 8 ; FanClubText8 + def_bg_events + bg_event 1, 0, 7 ; FanClubText7 + bg_event 6, 0, 8 ; FanClubText8 - def_objects - object SPRITE_FISHER, 6, 3, STAY, LEFT, 1 ; person - object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person - object SPRITE_FAIRY, 6, 4, STAY, LEFT, 3 ; person - object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person - object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person - object SPRITE_LINK_RECEPTIONIST, 5, 1, STAY, DOWN, 6 ; person + def_object_events + object_event 6, 3, SPRITE_FISHER, STAY, LEFT, 1 ; person + object_event 1, 3, SPRITE_GIRL, STAY, RIGHT, 2 ; person + object_event 6, 4, SPRITE_FAIRY, STAY, LEFT, 3 ; person + object_event 1, 4, SPRITE_SEEL, STAY, RIGHT, 4 ; person + object_event 3, 1, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person + object_event 5, 1, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person def_warps_to POKEMON_FAN_CLUB -- cgit v1.3.1-sl0p