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/Route15Gate2F.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/Route15Gate2F.asm')
| -rwxr-xr-x | data/maps/objects/Route15Gate2F.asm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/data/maps/objects/Route15Gate2F.asm b/data/maps/objects/Route15Gate2F.asm index 63b8bf2a..5c5bf450 100755 --- a/data/maps/objects/Route15Gate2F.asm +++ b/data/maps/objects/Route15Gate2F.asm @@ -1,14 +1,13 @@ Route15Gate2F_Object: db $a ; border block - db 1 ; warps + def_warps warp 7, 7, 4, ROUTE_15_GATE_1F - db 1 ; signs + def_signs sign 6, 2, 2 ; Route15GateUpstairsText2 - db 1 ; objects + def_objects object SPRITE_SCIENTIST, 4, 2, STAY, DOWN, 1 - ; warp-to - warp_to 7, 7, ROUTE_15_GATE_2F_WIDTH ; ROUTE_15_GATE_1F + def_warps_to ROUTE_15_GATE_2F |