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/PewterCity.asm | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'data/maps/objects/PewterCity.asm') diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index 13d228f2..0ae84c0f 100644 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm @@ -1,29 +1,29 @@ PewterCity_Object: db $a ; border block - def_warps - warp 14, 7, 0, MUSEUM_1F - warp 19, 5, 2, MUSEUM_1F - warp 16, 17, 0, PEWTER_GYM - warp 29, 13, 0, PEWTER_NIDORAN_HOUSE - warp 23, 17, 0, PEWTER_MART - warp 7, 29, 0, PEWTER_SPEECH_HOUSE - warp 13, 25, 0, PEWTER_POKECENTER + def_warp_events + warp_event 14, 7, MUSEUM_1F, 0 + warp_event 19, 5, MUSEUM_1F, 2 + warp_event 16, 17, PEWTER_GYM, 0 + warp_event 29, 13, PEWTER_NIDORAN_HOUSE, 0 + warp_event 23, 17, PEWTER_MART, 0 + warp_event 7, 29, PEWTER_SPEECH_HOUSE, 0 + warp_event 13, 25, PEWTER_POKECENTER, 0 - def_signs - sign 19, 29, 6 ; PewterCityText6 - sign 33, 19, 7 ; PewterCityText7 - sign 24, 17, 8 ; MartSignText - sign 14, 25, 9 ; PokeCenterSignText - sign 15, 9, 10 ; PewterCityText10 - sign 11, 17, 11 ; PewterCityText11 - sign 25, 23, 12 ; PewterCityText12 + def_bg_events + bg_event 19, 29, 6 ; PewterCityText6 + bg_event 33, 19, 7 ; PewterCityText7 + bg_event 24, 17, 8 ; MartSignText + bg_event 14, 25, 9 ; PokeCenterSignText + bg_event 15, 9, 10 ; PewterCityText10 + bg_event 11, 17, 11 ; PewterCityText11 + bg_event 25, 23, 12 ; PewterCityText12 - def_objects - object SPRITE_COOLTRAINER_F, 8, 15, STAY, NONE, 1 ; person - object SPRITE_COOLTRAINER_M, 17, 25, STAY, NONE, 2 ; person - object SPRITE_SUPER_NERD, 27, 17, STAY, NONE, 3 ; person - object SPRITE_SUPER_NERD, 26, 25, WALK, LEFT_RIGHT, 4 ; person - object SPRITE_YOUNGSTER, 35, 16, STAY, DOWN, 5 ; person + def_object_events + object_event 8, 15, SPRITE_COOLTRAINER_F, STAY, NONE, 1 ; person + object_event 17, 25, SPRITE_COOLTRAINER_M, STAY, NONE, 2 ; person + object_event 27, 17, SPRITE_SUPER_NERD, STAY, NONE, 3 ; person + object_event 26, 25, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 4 ; person + object_event 35, 16, SPRITE_YOUNGSTER, STAY, DOWN, 5 ; person def_warps_to PEWTER_CITY -- cgit v1.3.1-sl0p