diff options
| author | Yoann Fievez <yoann.fievez@gmail.com> | 2021-09-27 04:56:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-26 21:56:09 -0500 |
| commit | 2c4f35848b786864822a3f211df91de30a2857c9 (patch) | |
| tree | fcf65394ef3a2361d4dce8bd6cadaac8c9d021d3 /data/maps/objects/CeruleanCave1F.asm | |
| parent | `ASSERT LOW(wSpriteStateData1) == 0 && LOW(wSpriteStateData2) == 0` (diff) | |
| download | pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.gz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.tar.xz pokeyellow-2c4f35848b786864822a3f211df91de30a2857c9.zip | |
Unify map event gen1 gen2 (#335)
* Update sign to bg_event #289
* Rename warp to warp_event
* Replace object to object_event
* Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
Diffstat (limited to 'data/maps/objects/CeruleanCave1F.asm')
| -rw-r--r-- | data/maps/objects/CeruleanCave1F.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm index 7e5e8c85..255f200f 100644 --- a/data/maps/objects/CeruleanCave1F.asm +++ b/data/maps/objects/CeruleanCave1F.asm @@ -1,22 +1,22 @@ 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, 7, 13, STAY, NONE, 1, FULL_RESTORE - object SPRITE_POKE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER - object SPRITE_POKE_BALL, 5, 0, STAY, NONE, 3, NUGGET + def_object_events + object_event 7, 13, SPRITE_POKE_BALL, STAY, NONE, 1, FULL_RESTORE + object_event 19, 3, SPRITE_POKE_BALL, STAY, NONE, 2, MAX_ELIXER + object_event 5, 0, SPRITE_POKE_BALL, STAY, NONE, 3, NUGGET def_warps_to CERULEAN_CAVE_1F |