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/SilphCo1F.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/SilphCo1F.asm')
| -rwxr-xr-x | data/maps/objects/SilphCo1F.asm | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index 0e0df323..13ddf8b3 100755 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -1,21 +1,16 @@ SilphCo1F_Object: db $2e ; border block - db 5 ; warps + def_warps warp 10, 17, 5, LAST_MAP warp 11, 17, 5, LAST_MAP warp 26, 0, 0, SILPH_CO_2F warp 20, 0, 0, SILPH_CO_ELEVATOR warp 16, 10, 6, SILPH_CO_3F - db 0 ; signs + def_signs - db 1 ; objects + def_objects object SPRITE_LINK_RECEPTIONIST, 4, 2, STAY, DOWN, 1 ; person - ; warp-to - warp_to 10, 17, SILPH_CO_1F_WIDTH - warp_to 11, 17, SILPH_CO_1F_WIDTH - warp_to 26, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F - warp_to 20, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 16, 10, SILPH_CO_1F_WIDTH ; SILPH_CO_3F + def_warps_to SILPH_CO_1F |