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/rockethideout3.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/rockethideout3.asm')
-rwxr-xr-x | data/mapObjects/rockethideout3.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/rockethideout3.asm b/data/mapObjects/rockethideout3.asm index 90bfbb57..a8da69d2 100755 --- a/data/mapObjects/rockethideout3.asm +++ b/data/mapObjects/rockethideout3.asm @@ -1,18 +1,18 @@ RocketHideout3Object: db $2e ; border block - db $2 ; warps - db $6, $19, $1, ROCKET_HIDEOUT_2 - db $12, $13, $0, ROCKET_HIDEOUT_4 + db 2 ; warps + warp 25, 6, 1, ROCKET_HIDEOUT_2 + warp 19, 18, 0, ROCKET_HIDEOUT_4 - db $0 ; signs + db 0 ; signs - db $4 ; objects - object SPRITE_ROCKET, $a, $16, STAY, RIGHT, $1, OPP_ROCKET, $e - object SPRITE_ROCKET, $1a, $c, STAY, UP, $2, OPP_ROCKET, $f - object SPRITE_BALL, $1a, $11, STAY, NONE, $3, TM_10 - object SPRITE_BALL, $14, $e, STAY, NONE, $4, RARE_CANDY + db 4 ; objects + object SPRITE_ROCKET, 10, 22, STAY, RIGHT, 1, OPP_ROCKET, 14 + object SPRITE_ROCKET, 26, 12, STAY, UP, 2, OPP_ROCKET, 15 + object SPRITE_BALL, 26, 17, STAY, NONE, 3, TM_10 + object SPRITE_BALL, 20, 14, STAY, NONE, 4, RARE_CANDY ; warp-to - EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $6, $19 ; ROCKET_HIDEOUT_2 - EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $12, $13 ; ROCKET_HIDEOUT_4 + warp_to 25, 6, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_2 + warp_to 19, 18, ROCKET_HIDEOUT_3_WIDTH ; ROCKET_HIDEOUT_4 |