diff options
Diffstat (limited to 'data/maps/objects/SilphCo4F.asm')
| -rwxr-xr-x | data/maps/objects/SilphCo4F.asm | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/data/maps/objects/SilphCo4F.asm b/data/maps/objects/SilphCo4F.asm index ab53309a..f6eb8e31 100755 --- a/data/maps/objects/SilphCo4F.asm +++ b/data/maps/objects/SilphCo4F.asm @@ -1,7 +1,7 @@ SilphCo4F_Object: db $2e ; border block - db 7 ; warps + def_warps warp 24, 0, 1, SILPH_CO_3F warp 26, 0, 1, SILPH_CO_5F warp 20, 0, 0, SILPH_CO_ELEVATOR @@ -10,9 +10,9 @@ SilphCo4F_Object: warp 3, 15, 4, SILPH_CO_10F warp 17, 11, 5, SILPH_CO_10F - db 0 ; signs + def_signs - db 7 ; objects + def_objects object SPRITE_SILPH_WORKER, 6, 2, STAY, NONE, 1 ; person object SPRITE_ROCKET, 9, 14, STAY, RIGHT, 2, OPP_ROCKET, 26 object SPRITE_SCIENTIST, 14, 6, STAY, LEFT, 3, OPP_SCIENTIST, 5 @@ -21,11 +21,4 @@ SilphCo4F_Object: object SPRITE_POKE_BALL, 4, 7, STAY, NONE, 6, MAX_REVIVE object SPRITE_POKE_BALL, 5, 8, STAY, NONE, 7, ESCAPE_ROPE - ; warp-to - warp_to 24, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_3F - warp_to 26, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_5F - warp_to 20, 0, SILPH_CO_4F_WIDTH ; SILPH_CO_ELEVATOR - warp_to 11, 7, SILPH_CO_4F_WIDTH ; SILPH_CO_10F - warp_to 17, 3, SILPH_CO_4F_WIDTH ; SILPH_CO_6F - warp_to 3, 15, SILPH_CO_4F_WIDTH ; SILPH_CO_10F - warp_to 17, 11, SILPH_CO_4F_WIDTH ; SILPH_CO_10F + def_warps_to SILPH_CO_4F |