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/bruno.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/bruno.asm')
| -rwxr-xr-x | data/mapObjects/bruno.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/bruno.asm b/data/mapObjects/bruno.asm index a734b07b..45d21186 100755 --- a/data/mapObjects/bruno.asm +++ b/data/mapObjects/bruno.asm @@ -1,19 +1,19 @@ BrunoObject: db $3 ; border block - db $4 ; warps - db $b, $4, $2, LORELEIS_ROOM - db $b, $5, $3, LORELEIS_ROOM - db $0, $4, $0, AGATHAS_ROOM - db $0, $5, $1, AGATHAS_ROOM + db 4 ; warps + warp 4, 11, 2, LORELEIS_ROOM + warp 5, 11, 3, LORELEIS_ROOM + warp 4, 0, 0, AGATHAS_ROOM + warp 5, 0, 1, AGATHAS_ROOM - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_BRUNO, $5, $2, STAY, DOWN, $1, OPP_BRUNO, $1 + db 1 ; objects + object SPRITE_BRUNO, 5, 2, STAY, DOWN, 1, OPP_BRUNO, 1 ; warp-to - EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $4 ; LORELEIS_ROOM - EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $5 ; LORELEIS_ROOM - EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $4 ; AGATHAS_ROOM - EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $5 ; AGATHAS_ROOM + warp_to 4, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to 5, 11, BRUNOS_ROOM_WIDTH ; LORELEIS_ROOM + warp_to 4, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM + warp_to 5, 0, BRUNOS_ROOM_WIDTH ; AGATHAS_ROOM |