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/CeruleanCaveB1F.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/CeruleanCaveB1F.asm')
| -rw-r--r-- | data/maps/objects/CeruleanCaveB1F.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm index 886238c2..6e9c650b 100644 --- a/data/maps/objects/CeruleanCaveB1F.asm +++ b/data/maps/objects/CeruleanCaveB1F.asm @@ -1,14 +1,14 @@ 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, 16, 9, STAY, NONE, 2, ULTRA_BALL - object SPRITE_POKE_BALL, 18, 1, STAY, NONE, 3, MAX_REVIVE + def_object_events + object_event 27, 13, SPRITE_MONSTER, STAY, DOWN, 1, MEWTWO, 70 + object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL + object_event 18, 1, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE def_warps_to CERULEAN_CAVE_B1F |