diff options
author | Daniel Harding <33dannye@gmail.com> | 2018-02-05 10:57:14 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-05 10:57:14 -0600 |
commit | b8aa9ec80e43257a9e3a487b46a33f99c999a940 (patch) | |
tree | 3813e75239070dbb3d549e8c03297cc28b2551e3 /data/mapObjects/mtmoon2.asm | |
parent | c84667c4df36918071bb7487c456d7adafb921ca (diff) | |
parent | 819b6789099947e83b7e3f0b0e2f6d39cf901807 (diff) |
Merge pull request #174 from Rangi42/master
Add warp, sign, and warp_to macros for data/mapObjects definitions; use base 10 numbers
Diffstat (limited to 'data/mapObjects/mtmoon2.asm')
-rwxr-xr-x | data/mapObjects/mtmoon2.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/data/mapObjects/mtmoon2.asm b/data/mapObjects/mtmoon2.asm index f39cd4a5..abff4094 100755 --- a/data/mapObjects/mtmoon2.asm +++ b/data/mapObjects/mtmoon2.asm @@ -1,26 +1,26 @@ MtMoon2Object: db $3 ; border block - db $8 ; warps - db $5, $5, $2, MT_MOON_1 - db $b, $11, $0, MT_MOON_3 - db $9, $19, $3, MT_MOON_1 - db $f, $19, $4, MT_MOON_1 - db $11, $15, $1, MT_MOON_3 - db $1b, $d, $2, MT_MOON_3 - db $3, $17, $3, MT_MOON_3 - db $3, $1b, $2, $ff + db 8 ; warps + warp 5, 5, 2, MT_MOON_1 + warp 17, 11, 0, MT_MOON_3 + warp 25, 9, 3, MT_MOON_1 + warp 25, 15, 4, MT_MOON_1 + warp 21, 17, 1, MT_MOON_3 + warp 13, 27, 2, MT_MOON_3 + warp 23, 3, 3, MT_MOON_3 + warp 27, 3, 2, -1 - db $0 ; signs + db 0 ; signs - db $0 ; objects + db 0 ; objects ; warp-to - EVENT_DISP MT_MOON_2_WIDTH, $5, $5 ; MT_MOON_1 - EVENT_DISP MT_MOON_2_WIDTH, $b, $11 ; MT_MOON_3 - EVENT_DISP MT_MOON_2_WIDTH, $9, $19 ; MT_MOON_1 - EVENT_DISP MT_MOON_2_WIDTH, $f, $19 ; MT_MOON_1 - EVENT_DISP MT_MOON_2_WIDTH, $11, $15 ; MT_MOON_3 - EVENT_DISP MT_MOON_2_WIDTH, $1b, $d ; MT_MOON_3 - EVENT_DISP MT_MOON_2_WIDTH, $3, $17 ; MT_MOON_3 - EVENT_DISP MT_MOON_2_WIDTH, $3, $1b + warp_to 5, 5, MT_MOON_2_WIDTH ; MT_MOON_1 + warp_to 17, 11, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to 25, 9, MT_MOON_2_WIDTH ; MT_MOON_1 + warp_to 25, 15, MT_MOON_2_WIDTH ; MT_MOON_1 + warp_to 21, 17, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to 13, 27, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to 23, 3, MT_MOON_2_WIDTH ; MT_MOON_3 + warp_to 27, 3, MT_MOON_2_WIDTH |