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/SSAnneKitchen.asm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data/maps/objects/SSAnneKitchen.asm') diff --git a/data/maps/objects/SSAnneKitchen.asm b/data/maps/objects/SSAnneKitchen.asm index 75fc497f..bf6434e3 100644 --- a/data/maps/objects/SSAnneKitchen.asm +++ b/data/maps/objects/SSAnneKitchen.asm @@ -1,18 +1,18 @@ SSAnneKitchen_Object: db $c ; border block - def_warps - warp 6, 0, 10, SS_ANNE_1F + def_warp_events + warp_event 6, 0, SS_ANNE_1F, 10 - def_signs + def_bg_events - def_objects - object SPRITE_COOK, 1, 8, WALK, UP_DOWN, 1 ; person - object SPRITE_COOK, 5, 8, WALK, UP_DOWN, 2 ; person - object SPRITE_COOK, 9, 7, WALK, UP_DOWN, 3 ; person - object SPRITE_COOK, 13, 6, STAY, NONE, 4 ; person - object SPRITE_COOK, 13, 8, STAY, NONE, 5 ; person - object SPRITE_COOK, 13, 10, STAY, NONE, 6 ; person - object SPRITE_COOK, 11, 13, STAY, UP, 7 ; person + def_object_events + object_event 1, 8, SPRITE_COOK, WALK, UP_DOWN, 1 ; person + object_event 5, 8, SPRITE_COOK, WALK, UP_DOWN, 2 ; person + object_event 9, 7, SPRITE_COOK, WALK, UP_DOWN, 3 ; person + object_event 13, 6, SPRITE_COOK, STAY, NONE, 4 ; person + object_event 13, 8, SPRITE_COOK, STAY, NONE, 5 ; person + object_event 13, 10, SPRITE_COOK, STAY, NONE, 6 ; person + object_event 11, 13, SPRITE_COOK, STAY, UP, 7 ; person def_warps_to SS_ANNE_KITCHEN -- cgit v1.3.1-sl0p