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/CeruleanCave2F.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/CeruleanCave2F.asm')
| -rwxr-xr-x | data/maps/objects/CeruleanCave2F.asm | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 26dee8ef..09cf63e3 100755 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -1,7 +1,7 @@ CeruleanCave2F_Object: db $7d ; border block - db 6 ; warps + def_warps warp 29, 1, 2, CERULEAN_CAVE_1F warp 22, 6, 3, CERULEAN_CAVE_1F warp 19, 7, 4, CERULEAN_CAVE_1F @@ -9,17 +9,11 @@ CeruleanCave2F_Object: warp 1, 3, 6, CERULEAN_CAVE_1F warp 3, 11, 7, CERULEAN_CAVE_1F - db 0 ; signs + def_signs - db 3 ; objects + def_objects object SPRITE_POKE_BALL, 29, 9, STAY, NONE, 1, PP_UP object SPRITE_POKE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL object SPRITE_POKE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE - ; warp-to - warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 22, 6, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 19, 7, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 9, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 1, 3, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F - warp_to 3, 11, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F + def_warps_to CERULEAN_CAVE_2F |