diff options
| author | Yoann Fievez <yoann.fievez@gmail.com> | 2021-09-27 04:56:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-26 21:56:09 -0500 |
| commit | 2c4f35848b786864822a3f211df91de30a2857c9 (patch) | |
| tree | fcf65394ef3a2361d4dce8bd6cadaac8c9d021d3 /data/maps/objects/CeladonMart2F.asm | |
| parent | `ASSERT LOW(wSpriteStateData1) == 0 && LOW(wSpriteStateData2) == 0` (diff) | |
| download | pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.gz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.xz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.zip | |
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
Diffstat (limited to 'data/maps/objects/CeladonMart2F.asm')
| -rw-r--r-- | data/maps/objects/CeladonMart2F.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm index 19b2aa59..34313385 100644 --- a/data/maps/objects/CeladonMart2F.asm +++ b/data/maps/objects/CeladonMart2F.asm @@ -1,18 +1,18 @@ CeladonMart2F_Object: db $f ; border block - def_warps - warp 12, 1, 4, CELADON_MART_1F - warp 16, 1, 1, CELADON_MART_3F - warp 1, 1, 0, CELADON_MART_ELEVATOR + def_warp_events + warp_event 12, 1, CELADON_MART_1F, 4 + warp_event 16, 1, CELADON_MART_3F, 1 + warp_event 1, 1, CELADON_MART_ELEVATOR, 0 - def_signs - sign 14, 1, 5 ; CeladonMart2Text5 + def_bg_events + bg_event 14, 1, 5 ; CeladonMart2Text5 - def_objects - object SPRITE_CLERK, 5, 3, STAY, DOWN, 1 ; person - object SPRITE_CLERK, 6, 3, STAY, DOWN, 2 ; person - object SPRITE_MIDDLE_AGED_MAN, 19, 5, STAY, NONE, 3 ; person - object SPRITE_GIRL, 14, 4, WALK, UP_DOWN, 4 ; person + def_object_events + object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 1 ; person + object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 2 ; person + object_event 19, 5, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person + object_event 14, 4, SPRITE_GIRL, WALK, UP_DOWN, 4 ; person def_warps_to CELADON_MART_2F |