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/MtMoonB1F.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/MtMoonB1F.asm')
| -rwxr-xr-x | data/maps/objects/MtMoonB1F.asm | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/data/maps/objects/MtMoonB1F.asm b/data/maps/objects/MtMoonB1F.asm index 7c83d2fb..dc342955 100755 --- a/data/maps/objects/MtMoonB1F.asm +++ b/data/maps/objects/MtMoonB1F.asm @@ -1,7 +1,7 @@ MtMoonB1F_Object: db $3 ; border block - db 8 ; warps + def_warps warp 5, 5, 2, MT_MOON_1F warp 17, 11, 0, MT_MOON_B2F warp 25, 9, 3, MT_MOON_1F @@ -11,16 +11,8 @@ MtMoonB1F_Object: warp 23, 3, 3, MT_MOON_B2F warp 27, 3, 2, LAST_MAP - db 0 ; signs + def_signs - db 0 ; objects + def_objects - ; warp-to - warp_to 5, 5, MT_MOON_B1F_WIDTH ; MT_MOON_1F - warp_to 17, 11, MT_MOON_B1F_WIDTH ; MT_MOON_B2F - warp_to 25, 9, MT_MOON_B1F_WIDTH ; MT_MOON_1F - warp_to 25, 15, MT_MOON_B1F_WIDTH ; MT_MOON_1F - warp_to 21, 17, MT_MOON_B1F_WIDTH ; MT_MOON_B2F - warp_to 13, 27, MT_MOON_B1F_WIDTH ; MT_MOON_B2F - warp_to 23, 3, MT_MOON_B1F_WIDTH ; MT_MOON_B2F - warp_to 27, 3, MT_MOON_B1F_WIDTH + def_warps_to MT_MOON_B1F |