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/route20.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/route20.asm')
| -rwxr-xr-x | data/mapObjects/route20.asm | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/data/mapObjects/route20.asm b/data/mapObjects/route20.asm index a3527525..5f4d5647 100755 --- a/data/mapObjects/route20.asm +++ b/data/mapObjects/route20.asm @@ -1,26 +1,26 @@ Route20Object: db $43 ; border block - db $2 ; warps - db $5, $30, $0, SEAFOAM_ISLANDS_1 - db $9, $3a, $2, SEAFOAM_ISLANDS_1 + db 2 ; warps + warp 48, 5, 0, SEAFOAM_ISLANDS_1 + warp 58, 9, 2, SEAFOAM_ISLANDS_1 - db $2 ; signs - db $7, $33, $b ; Route20Text11 - db $b, $39, $c ; Route20Text12 + db 2 ; signs + sign 51, 7, 11 ; Route20Text11 + sign 57, 11, 12 ; Route20Text12 - db $a ; objects - object SPRITE_SWIMMER, $57, $8, STAY, UP, $1, OPP_SWIMMER, $9 - object SPRITE_SWIMMER, $44, $b, STAY, UP, $2, OPP_BEAUTY, $f - object SPRITE_SWIMMER, $2d, $a, STAY, DOWN, $3, OPP_BEAUTY, $6 - object SPRITE_SWIMMER, $37, $e, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $18 - object SPRITE_SWIMMER, $26, $d, STAY, DOWN, $5, OPP_SWIMMER, $a - object SPRITE_SWIMMER, $57, $d, STAY, UP, $6, OPP_SWIMMER, $b - object SPRITE_BLACK_HAIR_BOY_1, $22, $9, STAY, UP, $7, OPP_BIRD_KEEPER, $b - object SPRITE_SWIMMER, $19, $7, STAY, UP, $8, OPP_BEAUTY, $7 - object SPRITE_SWIMMER, $18, $c, STAY, DOWN, $9, OPP_JR_TRAINER_F, $10 - object SPRITE_SWIMMER, $f, $8, STAY, UP, $a, OPP_BEAUTY, $8 + db 10 ; objects + object SPRITE_SWIMMER, 87, 8, STAY, UP, 1, OPP_SWIMMER, 9 + object SPRITE_SWIMMER, 68, 11, STAY, UP, 2, OPP_BEAUTY, 15 + object SPRITE_SWIMMER, 45, 10, STAY, DOWN, 3, OPP_BEAUTY, 6 + object SPRITE_SWIMMER, 55, 14, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24 + object SPRITE_SWIMMER, 38, 13, STAY, DOWN, 5, OPP_SWIMMER, 10 + object SPRITE_SWIMMER, 87, 13, STAY, UP, 6, OPP_SWIMMER, 11 + object SPRITE_BLACK_HAIR_BOY_1, 34, 9, STAY, UP, 7, OPP_BIRD_KEEPER, 11 + object SPRITE_SWIMMER, 25, 7, STAY, UP, 8, OPP_BEAUTY, 7 + object SPRITE_SWIMMER, 24, 12, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16 + object SPRITE_SWIMMER, 15, 8, STAY, UP, 10, OPP_BEAUTY, 8 ; warp-to - EVENT_DISP ROUTE_20_WIDTH, $5, $30 ; SEAFOAM_ISLANDS_1 - EVENT_DISP ROUTE_20_WIDTH, $9, $3a ; SEAFOAM_ISLANDS_1 + warp_to 48, 5, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 + warp_to 58, 9, ROUTE_20_WIDTH ; SEAFOAM_ISLANDS_1 |