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/Route15.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/Route15.asm')
| -rwxr-xr-x | data/maps/objects/Route15.asm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/data/maps/objects/Route15.asm b/data/maps/objects/Route15.asm index 095e9743..76e3ae7c 100755 --- a/data/maps/objects/Route15.asm +++ b/data/maps/objects/Route15.asm @@ -1,16 +1,16 @@ Route15_Object: db $43 ; border block - db 4 ; warps + def_warps warp 7, 8, 0, ROUTE_15_GATE_1F warp 7, 9, 1, ROUTE_15_GATE_1F warp 14, 8, 2, ROUTE_15_GATE_1F warp 14, 9, 3, ROUTE_15_GATE_1F - db 1 ; signs + def_signs sign 39, 9, 12 ; Route15Text12 - db 11 ; objects + def_objects object SPRITE_COOLTRAINER_F, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 object SPRITE_COOLTRAINER_F, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 object SPRITE_COOLTRAINER_M, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6 @@ -23,8 +23,4 @@ Route15_Object: object SPRITE_COOLTRAINER_F, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23 object SPRITE_POKE_BALL, 18, 5, STAY, NONE, 11, TM_RAGE - ; warp-to - warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 7, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 14, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F - warp_to 14, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + def_warps_to ROUTE_15 |