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/fuchsiagym.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/fuchsiagym.asm')
| -rwxr-xr-x | data/mapObjects/fuchsiagym.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/data/mapObjects/fuchsiagym.asm b/data/mapObjects/fuchsiagym.asm index 023c23d3..23314fb9 100755 --- a/data/mapObjects/fuchsiagym.asm +++ b/data/mapObjects/fuchsiagym.asm @@ -1,22 +1,22 @@ FuchsiaGymObject: db $3 ; border block - db $2 ; warps - db $11, $4, $5, $ff - db $11, $5, $5, $ff + db 2 ; warps + warp 4, 17, 5, -1 + warp 5, 17, 5, -1 - db $0 ; signs + db 0 ; signs - db $8 ; objects - object SPRITE_BLACKBELT, $4, $a, STAY, DOWN, $1, OPP_KOGA, $1 - object SPRITE_ROCKER, $8, $d, STAY, DOWN, $2, OPP_JUGGLER, $7 - object SPRITE_ROCKER, $7, $8, STAY, RIGHT, $3, OPP_JUGGLER, $3 - object SPRITE_ROCKER, $1, $c, STAY, DOWN, $4, OPP_JUGGLER, $8 - object SPRITE_ROCKER, $3, $5, STAY, UP, $5, OPP_TAMER, $1 - object SPRITE_ROCKER, $8, $2, STAY, DOWN, $6, OPP_TAMER, $2 - object SPRITE_ROCKER, $2, $7, STAY, LEFT, $7, OPP_JUGGLER, $4 - object SPRITE_GYM_HELPER, $7, $f, STAY, DOWN, $8 ; person + db 8 ; objects + object SPRITE_BLACKBELT, 4, 10, STAY, DOWN, 1, OPP_KOGA, 1 + object SPRITE_ROCKER, 8, 13, STAY, DOWN, 2, OPP_JUGGLER, 7 + object SPRITE_ROCKER, 7, 8, STAY, RIGHT, 3, OPP_JUGGLER, 3 + object SPRITE_ROCKER, 1, 12, STAY, DOWN, 4, OPP_JUGGLER, 8 + object SPRITE_ROCKER, 3, 5, STAY, UP, 5, OPP_TAMER, 1 + object SPRITE_ROCKER, 8, 2, STAY, DOWN, 6, OPP_TAMER, 2 + object SPRITE_ROCKER, 2, 7, STAY, LEFT, 7, OPP_JUGGLER, 4 + object SPRITE_GYM_HELPER, 7, 15, STAY, DOWN, 8 ; person ; warp-to - EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $4 - EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $5 + warp_to 4, 17, FUCHSIA_GYM_WIDTH + warp_to 5, 17, FUCHSIA_GYM_WIDTH |