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/Route23.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/Route23.asm')
| -rwxr-xr-x | data/maps/objects/Route23.asm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/data/maps/objects/Route23.asm b/data/maps/objects/Route23.asm index b510c285..33c6611b 100755 --- a/data/maps/objects/Route23.asm +++ b/data/maps/objects/Route23.asm @@ -1,16 +1,16 @@ Route23_Object: db $f ; border block - db 4 ; warps + def_warps warp 7, 139, 2, ROUTE_22_GATE warp 8, 139, 3, ROUTE_22_GATE warp 4, 31, 0, VICTORY_ROAD_1F warp 14, 31, 1, VICTORY_ROAD_2F - db 1 ; signs + def_signs sign 3, 33, 8 ; Route23Text8 - db 7 ; objects + def_objects object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person object SPRITE_GUARD, 10, 56, STAY, DOWN, 2 ; person object SPRITE_SWIMMER, 8, 85, STAY, DOWN, 3 ; person @@ -19,8 +19,4 @@ Route23_Object: object SPRITE_GUARD, 8, 119, STAY, DOWN, 6 ; person object SPRITE_GUARD, 8, 136, STAY, DOWN, 7 ; person - ; warp-to - warp_to 7, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE - warp_to 8, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE - warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1F - warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2F + def_warps_to ROUTE_23 |