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/SilphCo7F.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/SilphCo7F.asm')
| -rwxr-xr-x | data/maps/objects/SilphCo7F.asm | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm index 1b75e66e..2fffa334 100755 --- a/data/maps/objects/SilphCo7F.asm +++ b/data/maps/objects/SilphCo7F.asm @@ -1,7 +1,7 @@ SilphCo7F_Object: db $2e ; border block - db 6 ; warps + def_warps warp 16, 0, 1, SILPH_CO_8F warp 22, 0, 0, SILPH_CO_6F warp 18, 0, 0, SILPH_CO_ELEVATOR @@ -9,9 +9,9 @@ SilphCo7F_Object: warp 5, 3, 8, SILPH_CO_3F warp 21, 15, 3, SILPH_CO_5F - db 0 ; signs + def_signs - db 11 ; objects + def_objects object SPRITE_SILPH_WORKER, 1, 5, STAY, NONE, 1 ; person object SPRITE_SILPH_WORKER, 13, 13, STAY, UP, 2 ; person object SPRITE_SILPH_WORKER, 7, 10, STAY, NONE, 3 ; person @@ -24,10 +24,4 @@ SilphCo7F_Object: object SPRITE_POKE_BALL, 1, 9, STAY, NONE, 10, CALCIUM object SPRITE_POKE_BALL, 24, 11, STAY, NONE, 11, TM_SWORDS_DANCE - ; warp-to - warp_to 16, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F - warp_to 22, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_6F - warp_to 18, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 5, 7, SILPH_CO_7F_WIDTH ; SILPH_CO_11F - warp_to 5, 3, SILPH_CO_7F_WIDTH ; SILPH_CO_3F - warp_to 21, 15, SILPH_CO_7F_WIDTH ; SILPH_CO_5F + def_warps_to SILPH_CO_7F |