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/route11.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/route11.asm')
| -rwxr-xr-x | data/mapObjects/route11.asm | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index 0c7828f2..8d8e35d6 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -1,31 +1,31 @@ Route11Object: db $f ; border block - db $5 ; warps - db $8, $31, $0, ROUTE_11_GATE_1F - db $9, $31, $1, ROUTE_11_GATE_1F - db $8, $3a, $2, ROUTE_11_GATE_1F - db $9, $3a, $3, ROUTE_11_GATE_1F - db $5, $4, $0, DIGLETTS_CAVE_ENTRANCE + db 5 ; warps + warp 49, 8, 0, ROUTE_11_GATE_1F + warp 49, 9, 1, ROUTE_11_GATE_1F + warp 58, 8, 2, ROUTE_11_GATE_1F + warp 58, 9, 3, ROUTE_11_GATE_1F + warp 4, 5, 0, DIGLETTS_CAVE_ENTRANCE - db $1 ; signs - db $5, $1, $b ; Route11Text11 + db 1 ; signs + sign 1, 5, 11 ; Route11Text11 - db $a ; objects - object SPRITE_GAMBLER, $a, $e, STAY, DOWN, $1, OPP_GAMBLER, $1 - object SPRITE_GAMBLER, $1a, $9, STAY, DOWN, $2, OPP_GAMBLER, $2 - object SPRITE_BUG_CATCHER, $d, $5, STAY, LEFT, $3, OPP_YOUNGSTER, $9 - object SPRITE_BLACK_HAIR_BOY_2, $24, $b, STAY, DOWN, $4, OPP_ENGINEER, $2 - object SPRITE_BUG_CATCHER, $16, $4, STAY, UP, $5, OPP_YOUNGSTER, $a - object SPRITE_GAMBLER, $2d, $7, STAY, DOWN, $6, OPP_GAMBLER, $3 - object SPRITE_GAMBLER, $21, $3, STAY, UP, $7, OPP_GAMBLER, $4 - object SPRITE_BUG_CATCHER, $2b, $5, STAY, RIGHT, $8, OPP_YOUNGSTER, $b - object SPRITE_BLACK_HAIR_BOY_2, $2d, $10, STAY, LEFT, $9, OPP_ENGINEER, $3 - object SPRITE_BUG_CATCHER, $16, $c, STAY, UP, $a, OPP_YOUNGSTER, $c + db 10 ; objects + object SPRITE_GAMBLER, 10, 14, STAY, DOWN, 1, OPP_GAMBLER, 1 + object SPRITE_GAMBLER, 26, 9, STAY, DOWN, 2, OPP_GAMBLER, 2 + object SPRITE_BUG_CATCHER, 13, 5, STAY, LEFT, 3, OPP_YOUNGSTER, 9 + object SPRITE_BLACK_HAIR_BOY_2, 36, 11, STAY, DOWN, 4, OPP_ENGINEER, 2 + object SPRITE_BUG_CATCHER, 22, 4, STAY, UP, 5, OPP_YOUNGSTER, 10 + object SPRITE_GAMBLER, 45, 7, STAY, DOWN, 6, OPP_GAMBLER, 3 + object SPRITE_GAMBLER, 33, 3, STAY, UP, 7, OPP_GAMBLER, 4 + object SPRITE_BUG_CATCHER, 43, 5, STAY, RIGHT, 8, OPP_YOUNGSTER, 11 + object SPRITE_BLACK_HAIR_BOY_2, 45, 16, STAY, LEFT, 9, OPP_ENGINEER, 3 + object SPRITE_BUG_CATCHER, 22, 12, STAY, UP, 10, OPP_YOUNGSTER, 12 ; warp-to - EVENT_DISP ROUTE_11_WIDTH, $8, $31 ; ROUTE_11_GATE_1F - EVENT_DISP ROUTE_11_WIDTH, $9, $31 ; ROUTE_11_GATE_1F - EVENT_DISP ROUTE_11_WIDTH, $8, $3a ; ROUTE_11_GATE_1F - EVENT_DISP ROUTE_11_WIDTH, $9, $3a ; ROUTE_11_GATE_1F - EVENT_DISP ROUTE_11_WIDTH, $5, $4 ; DIGLETTS_CAVE_ENTRANCE + warp_to 49, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to 49, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to 58, 8, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to 58, 9, ROUTE_11_WIDTH ; ROUTE_11_GATE_1F + warp_to 4, 5, ROUTE_11_WIDTH ; DIGLETTS_CAVE_ENTRANCE |