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/Route17.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/Route17.asm')
| -rwxr-xr-x | data/maps/objects/Route17.asm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/data/maps/objects/Route17.asm b/data/maps/objects/Route17.asm index f5bc4307..8642b211 100755 --- a/data/maps/objects/Route17.asm +++ b/data/maps/objects/Route17.asm @@ -1,9 +1,9 @@ Route17_Object: db $43 ; border block - db 0 ; warps + def_warps - db 6 ; signs + def_signs sign 9, 51, 11 ; Route17Text11 sign 9, 63, 12 ; Route17Text12 sign 9, 75, 13 ; Route17Text13 @@ -11,7 +11,7 @@ Route17_Object: sign 9, 111, 15 ; Route17Text15 sign 9, 141, 16 ; Route17Text16 - db 10 ; objects + def_objects object SPRITE_BIKER, 12, 19, STAY, LEFT, 1, OPP_CUE_BALL, 4 object SPRITE_BIKER, 11, 16, STAY, RIGHT, 2, OPP_CUE_BALL, 5 object SPRITE_BIKER, 4, 18, STAY, UP, 3, OPP_BIKER, 8 @@ -22,3 +22,5 @@ Route17_Object: object SPRITE_BIKER, 14, 98, STAY, RIGHT, 8, OPP_CUE_BALL, 8 object SPRITE_BIKER, 5, 98, STAY, LEFT, 9, OPP_BIKER, 11 object SPRITE_BIKER, 10, 118, STAY, DOWN, 10, OPP_BIKER, 12 + + def_warps_to ROUTE_17 |