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/route2.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/route2.asm')
| -rwxr-xr-x | data/mapObjects/route2.asm | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm index 7db8fe09..b62f9fdb 100755 --- a/data/mapObjects/route2.asm +++ b/data/mapObjects/route2.asm @@ -1,33 +1,33 @@ Route2Object: db $f ; border block - db $6 ; warps - db $9, $c, $0, DIGLETTS_CAVE_EXIT - db $b, $3, $1, VIRIDIAN_FOREST_EXIT - db $13, $f, $0, ROUTE_2_HOUSE - db $23, $10, $1, ROUTE_2_GATE - db $27, $f, $2, ROUTE_2_GATE - db $2b, $3, $2, VIRIDIAN_FOREST_ENTRANCE + db 6 ; warps + warp 12, 9, 0, DIGLETTS_CAVE_EXIT + warp 3, 11, 1, VIRIDIAN_FOREST_EXIT + warp 15, 19, 0, ROUTE_2_HOUSE + warp 16, 35, 1, ROUTE_2_GATE + warp 15, 39, 2, ROUTE_2_GATE + warp 3, 43, 2, VIRIDIAN_FOREST_ENTRANCE - db $2 ; signs - db $41, $5, $3 ; Route2Text3 - db $b, $b, $4 ; Route2Text4 + db 2 ; signs + sign 5, 65, 3 ; Route2Text3 + sign 11, 11, 4 ; Route2Text4 - db $2 ; objects - object SPRITE_BALL, $d, $36, STAY, NONE, $1, MOON_STONE - object SPRITE_BALL, $d, $2d, STAY, NONE, $2, HP_UP + db 2 ; objects + object SPRITE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE + object SPRITE_BALL, 13, 45, STAY, NONE, 2, HP_UP ; warp-to - EVENT_DISP ROUTE_2_WIDTH, $9, $c ; DIGLETTS_CAVE_EXIT - EVENT_DISP ROUTE_2_WIDTH, $b, $3 ; VIRIDIAN_FOREST_EXIT - EVENT_DISP ROUTE_2_WIDTH, $13, $f ; ROUTE_2_HOUSE - EVENT_DISP ROUTE_2_WIDTH, $23, $10 ; ROUTE_2_GATE - EVENT_DISP ROUTE_2_WIDTH, $27, $f ; ROUTE_2_GATE - EVENT_DISP ROUTE_2_WIDTH, $2b, $3 ; VIRIDIAN_FOREST_ENTRANCE + warp_to 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_EXIT + warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_EXIT + warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_HOUSE + warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE + warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE + warp_to 3, 43, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_ENTRANCE ; unused - EVENT_DISP $4, $7, $2 - db $12, $c7, $9, $7 - EVENT_DISP $4, $7, $2 - EVENT_DISP $4, $7, $2 - EVENT_DISP $4, $7, $2 + warp_to 2, 7, 4 + db $12, $c7, $9, $7 + warp_to 2, 7, 4 + warp_to 2, 7, 4 + warp_to 2, 7, 4 |