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/CinnabarLabFossilRoom.asm | |
| parent | f1285f8584ce7ff50ceb5e3134c0efc867209096 (diff) | |
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/CinnabarLabFossilRoom.asm')
| -rw-r--r-- | data/maps/objects/CinnabarLabFossilRoom.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index 8269eaeb..0c61cf88 100644 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -1,14 +1,14 @@ CinnabarLabFossilRoom_Object: db $17 ; border block - def_warps - warp 2, 7, 4, CINNABAR_LAB - warp 3, 7, 4, CINNABAR_LAB + def_warp_events + warp_event 2, 7, CINNABAR_LAB, 4 + warp_event 3, 7, CINNABAR_LAB, 4 - def_signs + def_bg_events - def_objects - object SPRITE_SCIENTIST, 5, 2, WALK, LEFT_RIGHT, 1 ; person - object SPRITE_SCIENTIST, 7, 6, STAY, UP, 2 ; person + def_object_events + object_event 5, 2, SPRITE_SCIENTIST, WALK, LEFT_RIGHT, 1 ; person + object_event 7, 6, SPRITE_SCIENTIST, STAY, UP, 2 ; person def_warps_to CINNABAR_LAB_FOSSIL_ROOM |