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/CeruleanCaveB1F.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/CeruleanCaveB1F.asm')
| -rw-r--r-- | data/maps/objects/CeruleanCaveB1F.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 3493ab7e..56632a1d 100644 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -1,16 +1,16 @@ CeruleanCaveB1F_Object: db $7d ; border block - def_warps - warp 3, 6, 8, CERULEAN_CAVE_1F + def_warp_events + warp_event 3, 6, CERULEAN_CAVE_1F, 8 - def_signs + def_bg_events - def_objects - object SPRITE_MONSTER, 27, 13, STAY, DOWN, 1, MEWTWO, 70 - object SPRITE_POKE_BALL, 26, 1, STAY, NONE, 2, ULTRA_BALL - object SPRITE_POKE_BALL, 2, 13, STAY, NONE, 3, ULTRA_BALL - object SPRITE_POKE_BALL, 3, 13, STAY, NONE, 4, MAX_REVIVE - object SPRITE_POKE_BALL, 15, 3, STAY, NONE, 5, MAX_ELIXER + def_object_events + object_event 27, 13, SPRITE_MONSTER, STAY, DOWN, 1, MEWTWO, 70 + object_event 26, 1, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL + object_event 2, 13, SPRITE_POKE_BALL, STAY, NONE, 3, ULTRA_BALL + object_event 3, 13, SPRITE_POKE_BALL, STAY, NONE, 4, MAX_REVIVE + object_event 15, 3, SPRITE_POKE_BALL, STAY, NONE, 5, MAX_ELIXER def_warps_to CERULEAN_CAVE_B1F |