diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-20 19:07:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 19:07:42 -0400 |
| commit | 7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f (patch) | |
| tree | ddda1118461d6151597a4bf9eefcb0eddc835da1 /data/maps/objects/CinnabarLabFossilRoom.asm | |
| parent | Use ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects (diff) | |
| parent | Comments explain the def_warps_to macros (diff) | |
| download | pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.gz pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.tar.xz pokeyellow-7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f.zip | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/CinnabarLabFossilRoom.asm')
| -rwxr-xr-x | data/maps/objects/CinnabarLabFossilRoom.asm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm index 9ab531c2..66d1da69 100755 --- a/data/maps/objects/CinnabarLabFossilRoom.asm +++ b/data/maps/objects/CinnabarLabFossilRoom.asm @@ -1,16 +1,14 @@ CinnabarLabFossilRoom_Object: db $17 ; border block - db 2 ; warps + def_warps warp 2, 7, 4, CINNABAR_LAB warp 3, 7, 4, CINNABAR_LAB - db 0 ; signs + def_signs - db 2 ; objects + def_objects object SPRITE_SCIENTIST, 5, 2, WALK, LEFT_RIGHT, 1 ; person object SPRITE_SCIENTIST, 7, 6, STAY, UP, 2 ; person - ; warp-to - warp_to 2, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB - warp_to 3, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB + def_warps_to CINNABAR_LAB_FOSSIL_ROOM |