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/Museum2F.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/Museum2F.asm')
| -rwxr-xr-x | data/maps/objects/Museum2F.asm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/data/maps/objects/Museum2F.asm b/data/maps/objects/Museum2F.asm index 525df06f..92700344 100755 --- a/data/maps/objects/Museum2F.asm +++ b/data/maps/objects/Museum2F.asm @@ -1,19 +1,18 @@ Museum2F_Object: db $a ; border block - db 1 ; warps + def_warps warp 7, 7, 4, MUSEUM_1F - db 2 ; signs + def_signs sign 11, 2, 6 ; Museum2FText6 sign 2, 5, 7 ; Museum2FText7 - db 5 ; objects + def_objects object SPRITE_YOUNGSTER, 1, 7, WALK, LEFT_RIGHT, 1 ; person object SPRITE_GRAMPS, 0, 5, STAY, DOWN, 2 ; person object SPRITE_SCIENTIST, 7, 5, STAY, DOWN, 3 ; person object SPRITE_BRUNETTE_GIRL, 11, 5, STAY, NONE, 4 ; person object SPRITE_HIKER, 12, 5, STAY, DOWN, 5 ; person - ; warp-to - warp_to 7, 7, MUSEUM_2F_WIDTH ; MUSEUM_1F + def_warps_to MUSEUM_2F |