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/CeruleanCave2F.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/CeruleanCave2F.asm')
| -rw-r--r-- | data/maps/objects/CeruleanCave2F.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 787ae539..2ac1c6da 100644 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -1,20 +1,20 @@ CeruleanCave2F_Object: db $7d ; border block - def_warps - warp 29, 1, 2, CERULEAN_CAVE_1F - warp 22, 6, 3, CERULEAN_CAVE_1F - warp 19, 7, 4, CERULEAN_CAVE_1F - warp 9, 1, 5, CERULEAN_CAVE_1F - warp 1, 3, 6, CERULEAN_CAVE_1F - warp 3, 11, 7, CERULEAN_CAVE_1F + def_warp_events + warp_event 29, 1, CERULEAN_CAVE_1F, 2 + warp_event 22, 6, CERULEAN_CAVE_1F, 3 + warp_event 19, 7, CERULEAN_CAVE_1F, 4 + warp_event 9, 1, CERULEAN_CAVE_1F, 5 + warp_event 1, 3, CERULEAN_CAVE_1F, 6 + warp_event 3, 11, CERULEAN_CAVE_1F, 7 - def_signs + def_bg_events - def_objects - object SPRITE_POKE_BALL, 0, 11, STAY, NONE, 1, RARE_CANDY - object SPRITE_POKE_BALL, 16, 7, STAY, NONE, 2, ULTRA_BALL - object SPRITE_POKE_BALL, 19, 11, STAY, NONE, 3, MAX_REVIVE - object SPRITE_POKE_BALL, 27, 9, STAY, NONE, 4, FULL_RESTORE + def_object_events + object_event 0, 11, SPRITE_POKE_BALL, STAY, NONE, 1, RARE_CANDY + object_event 16, 7, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL + object_event 19, 11, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE + object_event 27, 9, SPRITE_POKE_BALL, STAY, NONE, 4, FULL_RESTORE def_warps_to CERULEAN_CAVE_2F |