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/SilphCo11F.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/SilphCo11F.asm')
| -rwxr-xr-x | data/maps/objects/SilphCo11F.asm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index c26d5273..28bad624 100755 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -1,23 +1,19 @@ SilphCo11F_Object: db $d ; border block - db 4 ; warps + def_warps warp 9, 0, 1, SILPH_CO_10F warp 13, 0, 0, SILPH_CO_ELEVATOR warp 5, 5, 9, LAST_MAP warp 3, 2, 3, SILPH_CO_7F - db 0 ; signs + def_signs - db 5 ; objects + def_objects object SPRITE_SILPH_PRESIDENT, 7, 5, STAY, DOWN, 1 ; person object SPRITE_BEAUTY, 10, 5, STAY, DOWN, 2 ; person object SPRITE_GIOVANNI, 6, 9, STAY, DOWN, 3, OPP_GIOVANNI, 2 object SPRITE_ROCKET, 3, 16, STAY, UP, 4, OPP_ROCKET, 41 object SPRITE_ROCKET, 15, 9, STAY, UP, 5, OPP_ROCKET, 40 - ; warp-to - warp_to 9, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_10F - warp_to 13, 0, SILPH_CO_11F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 5, 5, SILPH_CO_11F_WIDTH - warp_to 3, 2, SILPH_CO_11F_WIDTH ; SILPH_CO_7F + def_warps_to SILPH_CO_11F |