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/CeruleanCaveB1F.asm | |
| parent | Use ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects (diff) | |
| parent | Comments explain the def_warps_to macros (diff) | |
| download | pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.gz pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.xz pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.zip | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/CeruleanCaveB1F.asm')
| -rwxr-xr-x | data/maps/objects/CeruleanCaveB1F.asm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 642ff0c7..7e6b532c 100755 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -1,15 +1,14 @@ CeruleanCaveB1F_Object: db $7d ; border block - db 1 ; warps + def_warps warp 3, 6, 8, CERULEAN_CAVE_1F - db 0 ; signs + def_signs - db 3 ; objects + def_objects object SPRITE_MONSTER, 27, 13, STAY, DOWN, 1, MEWTWO, 70 object SPRITE_POKE_BALL, 16, 9, STAY, NONE, 2, ULTRA_BALL object SPRITE_POKE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE - ; warp-to - warp_to 3, 6, CERULEAN_CAVE_B1F_WIDTH ; CERULEAN_CAVE_1F + def_warps_to CERULEAN_CAVE_B1F |