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/route15.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/route15.asm')
| -rwxr-xr-x | data/mapObjects/route15.asm | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index 1d83b20d..21fd2d97 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -1,30 +1,30 @@ Route15Object: db $43 ; border block - db $4 ; warps - db $8, $7, $0, ROUTE_15_GATE_1F - db $9, $7, $1, ROUTE_15_GATE_1F - db $8, $e, $2, ROUTE_15_GATE_1F - db $9, $e, $3, ROUTE_15_GATE_1F + db 4 ; warps + warp 7, 8, 0, ROUTE_15_GATE_1F + warp 7, 9, 1, ROUTE_15_GATE_1F + warp 14, 8, 2, ROUTE_15_GATE_1F + warp 14, 9, 3, ROUTE_15_GATE_1F - db $1 ; signs - db $9, $27, $c ; Route15Text12 + db 1 ; signs + sign 39, 9, 12 ; Route15Text12 - db $b ; objects - object SPRITE_LASS, $29, $b, STAY, DOWN, $1, OPP_JR_TRAINER_F, $14 - object SPRITE_LASS, $35, $a, STAY, LEFT, $2, OPP_JR_TRAINER_F, $15 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $d, STAY, UP, $3, OPP_BIRD_KEEPER, $6 - object SPRITE_BLACK_HAIR_BOY_1, $23, $d, STAY, UP, $4, OPP_BIRD_KEEPER, $7 - object SPRITE_FOULARD_WOMAN, $35, $b, STAY, DOWN, $5, OPP_BEAUTY, $9 - object SPRITE_FOULARD_WOMAN, $29, $a, STAY, RIGHT, $6, OPP_BEAUTY, $a - object SPRITE_BIKER, $30, $a, STAY, DOWN, $7, OPP_BIKER, $3 - object SPRITE_BIKER, $2e, $a, STAY, DOWN, $8, OPP_BIKER, $4 - object SPRITE_LASS, $25, $5, STAY, RIGHT, $9, OPP_JR_TRAINER_F, $16 - object SPRITE_LASS, $12, $d, STAY, UP, $a, OPP_JR_TRAINER_F, $17 - object SPRITE_BALL, $12, $5, STAY, NONE, $b, TM_20 + db 11 ; objects + object SPRITE_LASS, 41, 11, STAY, DOWN, 1, OPP_JR_TRAINER_F, 20 + object SPRITE_LASS, 53, 10, STAY, LEFT, 2, OPP_JR_TRAINER_F, 21 + object SPRITE_BLACK_HAIR_BOY_1, 31, 13, STAY, UP, 3, OPP_BIRD_KEEPER, 6 + object SPRITE_BLACK_HAIR_BOY_1, 35, 13, STAY, UP, 4, OPP_BIRD_KEEPER, 7 + object SPRITE_FOULARD_WOMAN, 53, 11, STAY, DOWN, 5, OPP_BEAUTY, 9 + object SPRITE_FOULARD_WOMAN, 41, 10, STAY, RIGHT, 6, OPP_BEAUTY, 10 + object SPRITE_BIKER, 48, 10, STAY, DOWN, 7, OPP_BIKER, 3 + object SPRITE_BIKER, 46, 10, STAY, DOWN, 8, OPP_BIKER, 4 + object SPRITE_LASS, 37, 5, STAY, RIGHT, 9, OPP_JR_TRAINER_F, 22 + object SPRITE_LASS, 18, 13, STAY, UP, 10, OPP_JR_TRAINER_F, 23 + object SPRITE_BALL, 18, 5, STAY, NONE, 11, TM_20 ; warp-to - EVENT_DISP ROUTE_15_WIDTH, $8, $7 ; ROUTE_15_GATE_1F - EVENT_DISP ROUTE_15_WIDTH, $9, $7 ; ROUTE_15_GATE_1F - EVENT_DISP ROUTE_15_WIDTH, $8, $e ; ROUTE_15_GATE_1F - EVENT_DISP ROUTE_15_WIDTH, $9, $e ; ROUTE_15_GATE_1F + warp_to 7, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to 7, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to 14, 8, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F + warp_to 14, 9, ROUTE_15_WIDTH ; ROUTE_15_GATE_1F |