diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-20 19:07:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 19:07:42 -0400 |
| commit | 7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f (patch) | |
| tree | ddda1118461d6151597a4bf9eefcb0eddc835da1 /data/maps/objects/CeladonMart2F.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/CeladonMart2F.asm')
| -rwxr-xr-x | data/maps/objects/CeladonMart2F.asm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm index dfd12d3c..061a030c 100755 --- a/data/maps/objects/CeladonMart2F.asm +++ b/data/maps/objects/CeladonMart2F.asm @@ -1,21 +1,18 @@ CeladonMart2F_Object: db $f ; border block - db 3 ; warps + def_warps warp 12, 1, 4, CELADON_MART_1F warp 16, 1, 1, CELADON_MART_3F warp 1, 1, 0, CELADON_MART_ELEVATOR - db 1 ; signs + def_signs sign 14, 1, 5 ; CeladonMart2Text5 - db 4 ; objects + 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 - ; warp-to - warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F - warp_to 16, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_3F - warp_to 1, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_ELEVATOR + def_warps_to CELADON_MART_2F |