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/route21.asm | |
| parent | Add pokegold and pokefirered. (diff) | |
| parent | INCBIN don't start with tabs (diff) | |
| download | pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.tar.gz pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.tar.xz pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.zip | |
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/route21.asm')
| -rwxr-xr-x | data/mapObjects/route21.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/route21.asm b/data/mapObjects/route21.asm index 1ed7b1cb..bb2409ce 100755 --- a/data/mapObjects/route21.asm +++ b/data/mapObjects/route21.asm @@ -1,17 +1,17 @@ Route21Object: db $43 ; border block - db $0 ; warps + db 0 ; warps - db $0 ; signs + db 0 ; signs - db $9 ; objects - object SPRITE_FISHER2, $4, $18, STAY, LEFT, $1, OPP_FISHER, $7 - object SPRITE_FISHER2, $6, $19, STAY, DOWN, $2, OPP_FISHER, $9 - object SPRITE_SWIMMER, $a, $1f, STAY, UP, $3, OPP_SWIMMER, $c - object SPRITE_SWIMMER, $c, $1e, STAY, RIGHT, $4, OPP_CUE_BALL, $9 - object SPRITE_SWIMMER, $10, $3f, STAY, DOWN, $5, OPP_SWIMMER, $d - object SPRITE_SWIMMER, $5, $47, STAY, RIGHT, $6, OPP_SWIMMER, $e - object SPRITE_SWIMMER, $f, $47, STAY, LEFT, $7, OPP_SWIMMER, $f - object SPRITE_FISHER2, $e, $38, STAY, LEFT, $8, OPP_FISHER, $8 - object SPRITE_FISHER2, $11, $39, STAY, RIGHT, $9, OPP_FISHER, $a + db 9 ; objects + object SPRITE_FISHER2, 4, 24, STAY, LEFT, 1, OPP_FISHER, 7 + object SPRITE_FISHER2, 6, 25, STAY, DOWN, 2, OPP_FISHER, 9 + object SPRITE_SWIMMER, 10, 31, STAY, UP, 3, OPP_SWIMMER, 12 + object SPRITE_SWIMMER, 12, 30, STAY, RIGHT, 4, OPP_CUE_BALL, 9 + object SPRITE_SWIMMER, 16, 63, STAY, DOWN, 5, OPP_SWIMMER, 13 + object SPRITE_SWIMMER, 5, 71, STAY, RIGHT, 6, OPP_SWIMMER, 14 + object SPRITE_SWIMMER, 15, 71, STAY, LEFT, 7, OPP_SWIMMER, 15 + object SPRITE_FISHER2, 14, 56, STAY, LEFT, 8, OPP_FISHER, 8 + object SPRITE_FISHER2, 17, 57, STAY, RIGHT, 9, OPP_FISHER, 10 |