diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:38:47 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:43:09 -0500 |
| commit | 501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch) | |
| tree | c2fe5cc6caa9d8117df3008031d7a26317058acb /data/maps/objects/CeruleanCave1F.asm | |
| parent | Switch from Travis CI to GitHub Actions (diff) | |
| parent | Fix typos (#334) (diff) | |
| download | pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.gz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.tar.xz pokeyellow-501a21fa5dc6f01c0563316c9cd209cccb1eef45.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/maps/objects/CeruleanCave1F.asm')
| -rw-r--r-- | data/maps/objects/CeruleanCave1F.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index 8c3d260e..6d1557fd 100644 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm @@ -1,23 +1,23 @@ CeruleanCave1F_Object: db $7d ; border block - def_warps - warp 24, 17, 6, LAST_MAP - warp 25, 17, 6, LAST_MAP - warp 27, 1, 0, CERULEAN_CAVE_2F - warp 23, 7, 1, CERULEAN_CAVE_2F - warp 18, 9, 2, CERULEAN_CAVE_2F - warp 7, 1, 3, CERULEAN_CAVE_2F - warp 1, 3, 4, CERULEAN_CAVE_2F - warp 3, 11, 5, CERULEAN_CAVE_2F - warp 0, 6, 0, CERULEAN_CAVE_B1F + def_warp_events + warp_event 24, 17, LAST_MAP, 6 + warp_event 25, 17, LAST_MAP, 6 + warp_event 27, 1, CERULEAN_CAVE_2F, 0 + warp_event 23, 7, CERULEAN_CAVE_2F, 1 + warp_event 18, 9, CERULEAN_CAVE_2F, 2 + warp_event 7, 1, CERULEAN_CAVE_2F, 3 + warp_event 1, 3, CERULEAN_CAVE_2F, 4 + warp_event 3, 11, CERULEAN_CAVE_2F, 5 + warp_event 0, 6, CERULEAN_CAVE_B1F, 0 - def_signs + def_bg_events - def_objects - object SPRITE_POKE_BALL, 29, 16, STAY, NONE, 1, RARE_CANDY - object SPRITE_POKE_BALL, 7, 11, STAY, NONE, 2, MAX_ELIXER - object SPRITE_POKE_BALL, 29, 9, STAY, NONE, 3, MAX_REVIVE - object SPRITE_POKE_BALL, 18, 3, STAY, NONE, 4, ULTRA_BALL + def_object_events + object_event 29, 16, SPRITE_POKE_BALL, STAY, NONE, 1, RARE_CANDY + object_event 7, 11, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_ELIXER + object_event 29, 9, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE + object_event 18, 3, SPRITE_POKE_BALL, STAY, NONE, 4, ULTRA_BALL def_warps_to CERULEAN_CAVE_1F |